Merge pull request #1174 from antonio-nino-diaz-arm/an/page-size