Merges maven branch into master

Merges the maven branch into the master branch.