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