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