follow upstream removal of doc
Merge branch 'upstream'