merge
Merge branch 'release/1.3.0'
Merge branch 'release/1.3.1'
Merge branch 'release/1.3.2'
Merge branch 'release/1.3.5'
Merge branch 'release/1.3.6'
fix pom scm values
Merge branch 'master' into develop