fix for https://opencart.atlassian.net/browse/OC-1803
Merge branch 'master' of https://github.com/opencart/opencart