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

CRAFTERCMS-807