Merge branch 'MDL-64968-master' of https://github.com/lucaboesch/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 6 May 2019 07:57:48 +0000 (15:57 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 7 May 2019 08:24:36 +0000 (16:24 +0800)

Trivial merge