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