merge in pom changes from master