Merge "Update version to 0.10.4" into gradle_0.10