Fix CRAFTERCMS-560
See issue for further instructions
Merge pull request #105 from cortiz/2.3.x

Fix CRAFTERCMS-560