Version 0.5.2
Merge pull request #8058 from reygonzales/master

Version 0.5.2