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

CRAFTERCMS-873