Merge in documentation updates