Merge branch 'MDL-67348-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 27 Nov 2019 02:35:30 +0000 (10:35 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 27 Nov 2019 02:35:30 +0000 (10:35 +0800)

Trivial merge