fix the page fixture
Merge branch 'refs/heads/master' into 2.1