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