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