Merge branch 'MDL-48685-28' of git://github.com/andrewnicols/moodle into MOODLE_28_STABLE