Merge branch 'wip_MDL-62576_master' of git://github.com/gjb2048/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jun 2018 02:25:01 +0000 (10:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jun 2018 02:25:01 +0000 (10:25 +0800)

Trivial merge