Update docs to reflect the merge into master