Merge remote branch 'origin/develop' into piledriver
authorwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 15:57:54 +0000 (16:57 +0100)
committerwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 15:57:54 +0000 (16:57 +0100)

Trivial merge