Merge pull request #222 from dejan-brkic/2.4.x

CRAFTERCMS-818