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

CRAFTERCMS-778