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