us #206 / bug #406 - Gradle bugfixing