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

CRAFTERCMS-650