Merge branch 'MDL-49848-master' of git://github.com/xow/moodle