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