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

CRAFTERCMS-834