Merge branch 'pu/101-maven-3.0.5' into next