Merged manual changes from the published website.