master -> doc

Master is the new head. Merge master into doc to make sure doc is up to date.