Clean bug fixes for issue / PR #975. Closes #975
Merge branch 'v1.5.6.1' of https://github.com/zilgrg/opencart into zgv1.5.6.1