Merge branch 'MDL-22077-master' of git://github.com/peterRd/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 4 Apr 2019 04:59:51 +0000 (12:59 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 4 Apr 2019 04:59:51 +0000 (12:59 +0800)

Trivial merge