Merge branch 'MDL-49942-master' of git://github.com/jleyva/moodle