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