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