Merge pull request #280 from dejan-brkic/master

CRAFTERCMS-874