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