Merge branch 'master' into documentation-update