Merge branch 'integration' of gitlab.it-innovation.soton.ac.uk:FLAME/consortium/3rdparties/flame-clmc