Merge branch 'MDL-67416' of https://github.com/stronk7/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 30 Dec 2019 02:48:35 +0000 (10:48 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 30 Dec 2019 02:48:35 +0000 (10:48 +0800)

Trivial merge