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