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

CRAFTERCMS-874