Merge branch 'master' into Mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Wed, 8 Mar 2017 19:36:06 +0000 (20:36 +0100)
committerMirio <opivy@hotmail.de>
Wed, 8 Mar 2017 19:36:06 +0000 (20:36 +0100)

Trivial merge