Merge branch 'MDL-68629_master' of https://github.com/t-schroeder/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 25 May 2020 08:14:54 +0000 (16:14 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 25 May 2020 08:14:54 +0000 (16:14 +0800)

Trivial merge