Merge pull request #775 from andrew-s/develop

Multiple improvements to Cart.php