Fixed broken merge
Fixed broken merge

andrewandante/silverstripe-queuedjobs,souldigital/silverstripe-queuedjobs,mattclegg/silverstripe-queuedjobs,silverstripe-australia/silverstripe-queuedjobs,mattclegg/silverstripe-queuedjobs,andrewandante/silverstripe-queuedjobs,souldigital/silverstripe-queuedjobs,open-sausages/silverstripe-queuedjobs,nyeholt/silverstripe-queuedjobs,nyeholt/silverstripe-queuedjobs,open-sausages/silverstripe-queuedjobs,silverstripe-australia/silverstripe-queuedjobs