Merge branch 'mavenize' into next