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