Compilation error when COMPRESSIBLE is enabled fixed
Merge branch 'master' into concentration