forward port #198 to indigo

As noted by @hersh on moveit-users: https://groups.google.com/forum/#!topic/moveit-users/KNlCGLXb46M