Merge remote-tracking branch 'origin/bug-1301' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 16 Oct 2014 19:00:38 +0000 (21:00 +0200)
committerMichael Tänzer <neo@nhng.de>
Thu, 16 Oct 2014 19:00:38 +0000 (21:00 +0200)

Trivial merge