Merge remote-tracking branch 'origin/bug-1237' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 22:46:53 +0000 (23:46 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 22:46:53 +0000 (23:46 +0100)

Trivial merge