Merge branch 'MDL-62500-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE