GRECLIPSE-1700
Fix for groovy 2.1