Merge branch 'wip-MDL-61308-master-unitfix' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 06:51:43 +0000 (14:51 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 May 2018 10:21:55 +0000 (12:21 +0200)

Trivial merge