Merge branch 'MDL-67215-master' of git://github.com/peterRd/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 13 Nov 2019 02:18:59 +0000 (10:18 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 13 Nov 2019 02:18:59 +0000 (10:18 +0800)

Trivial merge