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