https://github.com/opencart/opencart/pull/2064
Merge branch 'master' of https://github.com/opencart/opencart