UPGRADE 3.1

git-svn-id: https://silverstripe-ecommerce.googlecode.com/svn/modules/ecommerce_delivery/trunk@4682 950b781c-c544-efab-2f99-90083ee69683
UPGRADE 3.1

git-svn-id: https://silverstripe-ecommerce.googlecode.com/svn/modules/ecommerce_delivery/trunk@4684 950b781c-c544-efab-2f99-90083ee69683