Merged from Chris. Resolved conflict in pom.xml.