GAP-153 - compatibility with Gradle 2.0