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