Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Fri, 6 Mar 2015 21:36:47 +0000 (22:36 +0100)
committerMirio <opivy@hotmail.de>
Fri, 6 Mar 2015 21:36:47 +0000 (22:36 +0100)

Trivial merge