patches for upstream from groovy-patches