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

CRAFTERCMS-818
Merge remote-tracking branch 'upstream/2.2.x' into 2.2.x