Merge branch 'MDL-49237-master' of git://github.com/mastnym/moodle