Branch HEAD

Rename "pages" pointer to "npages", because it otherwise looks like an
array of pointers to pages instead of a pass-by-reference number of pages.
b=12682