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