Imported upstream version '0.3.1' of 'upstream'
Overlaid patches from 'groovy'