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

CRAFTERCMS-874