capacity constraint constructor now throws a useful error message rather than using an assert
Merge branch 'gidden-radio' into develop
Merge remote-tracking branch 'up/develop' into develop
fixing test_abi test failure