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

CRAFTERCMS-916