Merge pull request #1138 from anandpdoshi/hotfix

Shopping cart cookie fixes