Merge branch 'master' into Mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Wed, 8 Mar 2017 15:40:45 +0000 (16:40 +0100)
committerMirio <opivy@hotmail.de>
Wed, 8 Mar 2017 15:40:45 +0000 (16:40 +0100)

Trivial merge