Merge branch 'master' into Mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Sat, 5 Sep 2015 12:57:07 +0000 (14:57 +0200)
committerMirio <opivy@hotmail.de>
Sat, 5 Sep 2015 12:57:07 +0000 (14:57 +0200)

Trivial merge