Merge branch 'master' into maddin/map-warfare-updates
authorMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 22:37:10 +0000 (00:37 +0200)
committerMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 22:37:10 +0000 (00:37 +0200)

Trivial merge