fix page saves
Merge branch 'master' into master_candidate