Working copy has been rolled back to pre 790 pull request. These now part of 1.5.5.2 branch.

Pull request 792/793 added manually as it was dropped by the revert.
Merge branch 'v1.5.5.1' of git://github.com/opencart/opencart.git into v1.5.5.1