19c9137441
Merge commit '8ad422adaf2eb5d36e0391fcc2cd30a226cf87ab' * commit '8ad422adaf2eb5d36e0391fcc2cd30a226cf87ab': Remove links to wikipedia; fix typo; remove .vsd file (bug 1918247).