GRECLIPSE-1752 Fix & tests
GRECLIPSE-1748 Fix and tests
Merge pull request #64 from DenisMurashev/GRECLIPSE-1752

GRECLIPSE-1752 Fix & tests
Groovy 2.3.4 maven artifacts, snapshot build
Merge branch 'master' into GRECLIPSE-1748
Merge pull request #65 from DenisMurashev/GRECLIPSE-1748

GRECLIPSE-1748 Fix and tests