https://github.com/opencart/opencart/pull/1930
Update changelog.md
Merge remote-tracking branch 'upstream/master'