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