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

CRAFTERCMS-879