Minor site cleanup
Merge branch '1.10' into 1.11