Merge branch 'master' into debugger/shadow/atelier
authorMirio <opivy@hotmail.de>
Fri, 6 Mar 2015 21:40:18 +0000 (22:40 +0100)
committerMirio <opivy@hotmail.de>
Fri, 6 Mar 2015 21:40:18 +0000 (22:40 +0100)

Trivial merge