https://github.com/opencart/opencart/issues/1985
https://github.com/opencart/opencart/issues/1999
Merge remote-tracking branch 'upstream/master'