cherry pick from opencart/opncart/v1.5.6.x

cherry pick from opencart/opncart/v1.5.6.x
SHA1 20e37ba9ce7590ab086cddaafdbd92cccb726f20
April 25, 2014