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