Merge branch 'release/release-0.2'
Re-enabled features that changed names
Removed fsp_blocks feature (again) - not working right, at this point easier to do manually
Merge branch 'hotfix/release-0.3' into develop