https://github.com/opencart/opencart/issues/2144
Merge branch 'master' of https://github.com/opencart/opencart
https://github.com/opencart/opencart/issues/2150
https://github.com/opencart/opencart/issues/2155
Merge pull request #1 from opencart/master

合并作者更新