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

Trivial merge