Merge branch 'MDL-29619-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_S...