Merge remote branch 'origin/bulldozer' into develop
authorwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 17:06:14 +0000 (18:06 +0100)
committerwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 17:06:14 +0000 (18:06 +0100)

Trivial merge