Merge branch 'master' into releases/1.3.0
fix version