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