Merge changes in groovy-devel

https://github.com/RobotWebTools/rosbridge_suite/issues/71