Merge pull request #265 from dejan-brkic/2.3.x

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

CRAFTERCMS-864