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