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

CRAFTERCMS-873