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