Merge branch 'master' into releases 3.2.1
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:53:04 +0000 (10:53 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:53:04 +0000 (10:53 +0200)

Trivial merge