https://github.com/opencart/opencart/issues/1869
Merge branch 'master' of https://github.com/opencart/opencart