Fix for some pagination variable errors
Merge branch '2.2/develop' of https://github.com/pyrocms/pyrocms into 2.2/develop