Merge branch 'master' into maddin/map-warfare
authorMirio <opivy@hotmail.de>
Mon, 16 Mar 2015 14:19:23 +0000 (15:19 +0100)
committerMirio <opivy@hotmail.de>
Mon, 16 Mar 2015 14:19:23 +0000 (15:19 +0100)

Trivial merge