fixes #96
Merge branch 'hydro-devel' into groovy-devel
Merge branch 'hydro-devel' into groovy-devel
rqt_marble) Cleaned code to remove a compile-time warning.