Fixes pagination on permalinks
Merge branch 'master' into b3s