Merge pull request #219 from dejan-brkic/master

CRAFTERCMS-810