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

CRAFTERCMS-893