Merge branch 'documentation' into jarodwen/doc/indent