Merge remote-tracking branch 'frappe/develop' into wip-4.1
Fixes to shopping cart
Merge pull request #28 from anandpdoshi/anand-wip-4.1

Fixes to shopping cart
Merge pull request #29 from frappe/wip-4.1

Wip 4.1