Updated 1.5.2
Merge remote-tracking branch 'refs/remotes/origin/master'