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

CRAFTERCMS-916