Reversed merge to perserve user specified pagination.
Merge branch 'master' of github.com:Twistage/helix