FIX Back port of bug fixes and enhancements from silverstripe.org/forum
Merge pull request #80 from camfindlay/backports-ssorg

FIX Back port of bug fixes and enhancements from silverstripe.org/forum