Add pager support for output.
Merge remote-tracking branch 'upstream/master'