5b224948aa
(changes in blocks done, please check them) Merged from MOODLE_14_STABLE
(changes in blocks done, please check them) Merged from MOODLE_14_STABLE