Merge branch 'master' into releases 3.3.1.1
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 09:00:04 +0000 (11:00 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 09:00:04 +0000 (11:00 +0200)

Trivial merge