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