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