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