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

CRAFTERCMS-893