Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Thu, 20 Aug 2015 07:07:24 +0000 (09:07 +0200)
committerMirio <opivy@hotmail.de>
Thu, 20 Aug 2015 07:07:24 +0000 (09:07 +0200)

Trivial merge