Merge branch 'MDL-71689-master' of git://github.com/ilyatregubov/moodle