Update to 1.5.2
Merge branch 'master' into 1.5.2