Merge branch 'w04_MDL-37726_m25_prevnext_int' of git://github.com/skodak/moodle