Merge pull request #105 from cortiz/2.3.x

Fix CRAFTERCMS-560