Merge branch 'wip-MDL-62137-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 May 2018 07:24:01 +0000 (15:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 May 2018 07:24:01 +0000 (15:24 +0800)

Trivial merge