Merge branch 'MDL-77987_401' of https://github.com/AnupamaSarjoshi/moodle into MOODLE...