UPGRADE 3.1

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