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