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