Merge branch 'MDL-66876-master' of git://github.com/jleyva/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 24 Oct 2019 07:14:45 +0000 (15:14 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 24 Oct 2019 07:14:45 +0000 (15:14 +0800)

Trivial merge