pseudofix for NPE in page info building
Merge branch 'master' into beta