Merge branch 'master' into Mirio/darkzone
authorMirio <opivy@hotmail.de>
Wed, 20 Jan 2016 08:58:50 +0000 (09:58 +0100)
committerMirio <opivy@hotmail.de>
Wed, 20 Jan 2016 08:58:50 +0000 (09:58 +0100)

Trivial merge