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

Trivial merge