Merge pull request #223 from dejan-brkic/master

CRAFTERCMS-818
Merge remote-tracking branch 'upstream/master'