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