Feature flags
Merge pull request #1007 from remy/feature/flags

Feature flags