Version 0.5.2
Merge remote-tracking branch 'remotes/origin/1.7.2' into 1.6.4