Fix bad merge
Merge branch 'master' into modules_M