Merge pull request #239 from dejan-brkic/master

CRAFTERCMS-834