Possible fix for #591, needs to be tested on a mac
Merge pull request #592 from ros-visualization/fix-591

Possible fix for #591, needs to be tested on a mac