Merge branch 'MDL-48276-27' of git://github.com/danpoltawski/moodle into MOODLE_27_STABLE