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