fix infiniteScrolling not work
Merge branch 'master' into pianke