Merge branch 'Mirio/mapfixes'
authorMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 23:21:59 +0000 (00:21 +0100)
committerMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 23:21:59 +0000 (00:21 +0100)

Trivial merge