Merge "Update for version 0.11.2" into gradle_0.11