Rebase from 'upstream'
patches for upstream from groovy-patches