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