https://github.com/opencart/opencart/issues/2144
Merge branch 'master' of https://github.com/opencart/opencart
https://github.com/opencart/opencart/issues/2150
Merge remote-tracking branch 'upstream/master'