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