Merge pull request #205 from dejan-brkic/master

CRAFTERCMS-778