Fix compilation
Merge branch 'master' into exclusive