https://github.com/opencart/opencart/issues/2002
https://github.com/opencart/opencart/issues/1967
http://forum.opencart.com/viewtopic.php?f=110&t=132242&p=521027#p521027
Merge remote-tracking branch 'upstream/master'