Merge branch 'MDL-51148-28-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_28_...