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

Trivial merge