Merge branch 'MDL-46063_master' of git://github.com/schach/moodle