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