Merge branch 'GROOVY-6294' of https://github.com/kentis/groovy-core into GROOVY-6294
Merge branch 'GROOVY-6294' of https://github.com/kentis/groovy-core into GROOVY-6294