Merged in new packages from groovy_unstable.