Merge branch 'master' into maddin/map-warfare
authorMirio <opivy@hotmail.de>
Fri, 6 Mar 2015 21:38:50 +0000 (22:38 +0100)
committerMirio <opivy@hotmail.de>
Fri, 6 Mar 2015 21:38:50 +0000 (22:38 +0100)

Trivial merge