doc++
Merge branch 'master' into compatibility