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