Merge branch 'master' into matthiaskrgr/darkzone
authorMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:00:39 +0000 (17:00 +0100)
committerMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:00:39 +0000 (17:00 +0100)

Trivial merge