Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/pom/pom.xml
Merged upstream branch into local master. Resolved conflict in pom.xml.