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