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