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

CRAFTERCMS-883