Imported upstream version '1.5.4' of 'upstream'
Overlaid patches from 'groovy_patch'