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