Merge branch '1.3.0'
fixed branch-alias
Merge branch 'hotfix-1.3.1' into develop