Fix octomap branch (D'oh!)
Merge pull request #2853 from ahornung/patch-33

Fix octomap branch (D'oh!)