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

CRAFTERCMS-877