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