Merge pull request #4526 from wtgodbe/groovyFix