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

CRAFTERCMS-857