Pre merge commit
Merge branch 'master' into marc
Some cleaning