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