Solves CRAFTERCMS-809
Merge pull request #228 from cortiz/2.2.x

Solves CRAFTERCMS-809