Merge branch 'MDL-49520-master' of git://github.com/gurgus/moodle