Version 0.4.0
Merge pull request #7223 from reygonzales/master

Version 0.4.0