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