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

CRAFTERCMS-883