Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Tue, 27 Oct 2015 10:09:00 +0000 (11:09 +0100)
committerMirio <opivy@hotmail.de>
Tue, 27 Oct 2015 10:09:00 +0000 (11:09 +0100)

Trivial merge