Speedups to pages.
Merge branch 'release-1.1' into development