Patch for issue GROOVY-7043
Merge pull request #548 from pditommaso/master

Patch for issue GROOVY-7043