Merge branch 'MDL-28931_m19' of git://github.com/stronk7/moodle into MOODLE_19_STABLE