https://github.com/opencart/opencart/pull/2064
Merge remote-tracking branch 'upstream/master'
Merged master fixed conflict.