Merge branch 'MDL-61574-master' of git://github.com/tallthom/moodle