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

CRAFTERCMS-869