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