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