Merge pull request #9334 from annando/endless-scroll