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

CRAFTERCMS-774