Merge release candidate changes, but fix pom version.