Merging sonatype work into master