Add change made to master to docs-overhaul