Merge branch 'master' into Mirio/geoplanetary 67/head
authorMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:24:42 +0000 (21:24 +0100)
committerMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:24:42 +0000 (21:24 +0100)

Trivial merge