Merge branch 'w04_MDL-31184_m23_glosreset' of git://github.com/skodak/moodle