Merge branch 'hotfix-sonatype'