Version 0.5.0
Merge pull request #7230 from reygonzales/master

Version 0.5.0