Merge branch 'MDL-66705-master' of git://github.com/abgreeve/moodle