Merge remote-tracking branch 'origin/bug-1219' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 6 Nov 2013 15:22:50 +0000 (16:22 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 6 Nov 2013 15:22:50 +0000 (16:22 +0100)

Trivial merge