Merge pull request #245 from dejan-brkic/master

CRAFTERCMS-849