Version 0.3.1
Merge pull request #6971 from reygonzales/master

Version 0.3.1