Merge branch 'master' of https://github.com/pioneerspacesim/pioneer
Merge branch 'master' of https://github.com/tramsch/pioneer