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