Merge pull request #251 from dejan-brkic/master

CRAFTERCMS-865