Moodle release 2.3.5
Merge branch 'MOODLE_23_STABLE' into sbhs_23