Merge branch 'MDL-62497-master-final' of git://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 19 Jul 2019 06:22:44 +0000 (14:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 19 Jul 2019 06:22:44 +0000 (14:22 +0800)

Trivial merge