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