Merge branch 'master' into mirio/mapfixes
authorMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 23:20:42 +0000 (00:20 +0100)
committerMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 23:20:42 +0000 (00:20 +0100)

Trivial merge