fixing bad merge to ros-visualization/groovy-devel branch