CLPPlus scripts
Merge branch 'master' into clpplus
CLPPlus scripts