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

CRAFTERCMS-873