Merge pull request #216 from dejan-brkic/master

CRAFTERCMS-802