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