Merge branch 'Mirio/darkzone'
authorMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 16:37:57 +0000 (17:37 +0100)
committerMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 16:37:57 +0000 (17:37 +0100)

Trivial merge