Constraint control doesn't quite work.
Merge branch 'master' of github.com:amelim/RIP-2013-P2