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