Merge branch 'w04_MDL-37718_m25_rs' of git://github.com/skodak/moodle