fix #308
Merge branch 'hydro-devel' into pick_place_traj