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

CRAFTERCMS-802