Version 0.5.1
Merge pull request #7262 from reygonzales/master

Version 0.5.1