Merge branch 'MOODLE_253' into MOODLE_253_BFC
Merge branch 'MOODLE_253' into MOODLE_253_BFC
Merge remote-tracking branch 'origin/MOODLE_253_BFC' into MOODLE_253_BFC