Merge branch 'MDL-65396-master' of https://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Mon, 6 May 2019 08:19:57 +0000 (10:19 +0200)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 7 May 2019 08:24:38 +0000 (16:24 +0800)

Trivial merge