Merge branch 'master' into jarodwen/hotfix/doc_format