Merge pull request #240 from dejan-brkic/2.2.x

CRAFTERCMS-841