Cleaning up some spec-related problems
Merge branch 'master' into exemplar_cp_model