Merge branch 'MDL-50472-37' of git://github.com/Chocolate-lightning/moodle into MOODL...