Merge remote-tracking branch 'origin/bug-1257' into release
authorMichael Tänzer <neo@nhng.de>
Fri, 21 Mar 2014 18:00:52 +0000 (19:00 +0100)
committerMichael Tänzer <neo@nhng.de>
Fri, 21 Mar 2014 18:00:52 +0000 (19:00 +0100)

Trivial merge