Pulled in updates from groovy_unstable.