Imported upstream version '0.93.0' of 'upstream'
Overlaid patches from 'ros'