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