Merge branch 'master' into mingw
Merge branch 'mingw' of https://github.com/Salmito/clp into mingw