merge GROOVY-6093 from master