suppress Javadoc erros in parent pom
Merge branch 'master' into develop