Merge pull request #276 from dejan-brkic/master

CRAFTERCMS-883