Applied "fast-pagination" patch from "cactuslab" (e3629c5)