Merge branch 'master' into Mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:37:47 +0000 (00:37 +0200)
committerMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:37:47 +0000 (00:37 +0200)

Trivial merge