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