Merge remote branch 'origin/master' into piledriver
authorwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 17:03:34 +0000 (18:03 +0100)
committerwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 17:03:34 +0000 (18:03 +0100)

Trivial merge