Merge into mvn-repo branch.