CRAFTERCMS-844
Merge pull request #289 from rart/2.4.x

CRAFTERCMS-844