Merge branch 'master' into mirio/map_updates
authorMirio <opivy@hotmail.de>
Tue, 17 Jun 2014 14:22:04 +0000 (16:22 +0200)
committerMirio <opivy@hotmail.de>
Tue, 17 Jun 2014 14:22:04 +0000 (16:22 +0200)

Trivial merge