Fix problem when merging manifests
Merge pull request #555 from SamWhited/build-fixes

Fix problem when merging manifests during a Gradle build