Merge branch 'm27_MDL-47054' of git://github.com/totara/moodle into MOODLE_27_STABLE