Update version
Merge branch 'master' into 1.5.2
Merge branch '1.5.2' into 1.4.7