capacity constraint constructor now throws a useful error message rather than using an assert
Merge branch 'gidden-radio' into develop