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