Merge remote branch 'origin/master' into bulldozer
authorwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 15:55:24 +0000 (16:55 +0100)
committerwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 15:55:24 +0000 (16:55 +0100)

Trivial merge