Merge branch 'documentation_team' into 'master'