Fixes to support reloading.
Gradle 1.4