finally got pagination to work for reals
Merge remote-tracking branch 'origin'