Merge branch 'MDL-46281-master' of git://github.com/lucisgit/moodle