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