Introduce workaround for GROOVY-6946
Merge branch 'master' of github.com:canoo/open-dolphin