Merge branch 'release1.3'
Merge branch 'master' into release1.4