Fix an reference to a deprecated PAGE_SIZE static
Merge branch 'master' into ios