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

CRAFTERCMS-849