Merge branch 'master' into debugger/shadow/atelier
authorMirio <opivy@hotmail.de>
Wed, 15 Apr 2015 23:34:15 +0000 (01:34 +0200)
committerMirio <opivy@hotmail.de>
Wed, 15 Apr 2015 23:34:15 +0000 (01:34 +0200)

Trivial merge