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

CRAFTERCMS-799