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