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

CRAFTERCMS-865