Version 0.3.2
Merge pull request #7186 from reygonzales/master

Version 0.3.2