Merge branch 'MDL-69077_39' of https://github.com/timhunt/moodle into MOODLE_39_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 22 Jun 2020 02:41:47 +0000 (10:41 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 22 Jun 2020 02:41:47 +0000 (10:41 +0800)

Trivial merge