Merge branch 'master' into debugger/shadow/atelier
authorMirio <opivy@hotmail.de>
Mon, 6 Apr 2015 16:40:30 +0000 (18:40 +0200)
committerMirio <opivy@hotmail.de>
Mon, 6 Apr 2015 16:40:30 +0000 (18:40 +0200)

Trivial merge