Pulls/3.2 update

Make master (0.8 branch) compatible with silverstripe 3.2