https://github.com/opencart/opencart/pull/1930
Merge pull request #44 from ocshop/master

https://github.com/opencart/opencart/pull/1930