Merge pull request #263 from dejan-brkic/master

CRAFTERCMS-877