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