Fix issue #30
Some contexts don't have a paginator
Merge remote-tracking branch 'upstream/0.4.0' into develop