Merge branch 'master' of git://github.com/OctoMap/octomap
Merge branch 'devel' of git://github.com/OctoMap/octomap
Merge branch 'master' of github-dornhege:dornhege/octomap into devel