Fix for CRAFTERCMS-574.
Merge pull request #118 from avasquez614/2.3.x

Fix for CRAFTERCMS-574.
Merge pull request #119 from cortiz/2.3.x

2.3.x
Fixes CRAFTERCMS-791