Merge branch 'master' into maddin/map-warfare
authorMirio <opivy@hotmail.de>
Wed, 6 May 2015 10:06:03 +0000 (12:06 +0200)
committerMirio <opivy@hotmail.de>
Wed, 6 May 2015 10:06:03 +0000 (12:06 +0200)

Trivial merge