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

CRAFTERCMS-857