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

Trivial merge