Merge branch 'master' into debugger/shadow/atelier
authorMirio <opivy@hotmail.de>
Mon, 16 Mar 2015 14:18:55 +0000 (15:18 +0100)
committerMirio <opivy@hotmail.de>
Mon, 16 Mar 2015 14:18:55 +0000 (15:18 +0100)

Trivial merge