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

Trivial merge