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