Moodle release 2.5.3
Merge branch 'MOODLE_25_STABLE' into MOODLE_25_BFC