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