Bugfixes from cathode.
Use gradle 1.11