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