BUGFIX code typo causing bug where block set blocks were not being applied in some cases
Merge branch 'master' of git://github.com/sheadawson/silverstripe-blocks