Merge branch 'MDL-67691' of https://github.com/stronk7/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 27 Jan 2020 23:52:21 +0000 (07:52 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 27 Jan 2020 23:52:21 +0000 (07:52 +0800)

Trivial merge