Solves CRAFTERCMS-809
Merge pull request #229 from cortiz/2.3.x

Solves CRAFTERCMS-809