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

CRAFTERCMS-869