Pass through correct parameter for user paging to work
Merge branch '4.2/user-paging' into 4.2-trunk