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

CRAFTERCMS-814