Fix problem with paginator's input action
Merge remote-tracking branch 'origin/master'