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