Merge branch 'master' into global-anims
authorHolger Schemel <info@artsoft.org>
Tue, 1 Mar 2016 23:56:08 +0000 (00:56 +0100)
committerHolger Schemel <info@artsoft.org>
Tue, 1 Mar 2016 23:56:08 +0000 (00:56 +0100)

Trivial merge