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