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