Merge remote-tracking branch 'origin/bug-1045' into release
authorMichael Tänzer <neo@nhng.de>
Wed, 20 Nov 2013 14:05:09 +0000 (15:05 +0100)
committerMichael Tänzer <neo@nhng.de>
Wed, 20 Nov 2013 14:05:09 +0000 (15:05 +0100)

Trivial merge