CRAFTERCMS-864
Merge pull request #272 from rart/2.3.x

CRAFTERCMS-864