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