Merge branch 'master' into debugger/shadow/atelier
authorMirio <opivy@hotmail.de>
Tue, 5 May 2015 12:14:27 +0000 (14:14 +0200)
committerMirio <opivy@hotmail.de>
Tue, 5 May 2015 12:14:27 +0000 (14:14 +0200)

Trivial merge