Merge branch 'gazebo_interface' into hydro-devel