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