match mzn requirements for challenge 2013
Merge branch 'feature-mzn' into develop