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