Merge branch 'bug-1244' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 5 Feb 2014 16:03:56 +0000 (17:03 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 5 Feb 2014 16:03:56 +0000 (17:03 +0100)

Trivial merge