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