fix ValueError on max([]) when there are no cart items
Merge remote-tracking branch 'upstream/master'