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