Merge branch '1.1e'
Merge branch '1.1e'
Merge branch 'release-1.1e-rev1'
Merge branch 'release-1.2.0'
Merge develop
Release 1.3.0
Update to new develop version 1.3.1