submodule update
Merge branch 'master' into massif1