Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine