Merge "Fix various docs and version numbers from 84a2f570"