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

CRAFTERCMS-857