Merge branch 'release-1.3' into develop
Merge branch 'develop' of github.com:JCRin/test into develop