test
https://github.com/opencart/opencart/issues/2258
https://github.com/opencart/opencart/issues/2266
Merge remote-tracking branch 'upstream/master'
Merge pull request #84 from ocshop/master

догоняем оригинал