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