MERGING 2.4.10 into this branch

git-svn-id: https://silverstripe-ecommerce.googlecode.com/svn/branches/2.5@4540 950b781c-c544-efab-2f99-90083ee69683