Merge branch 'MDL-65387-master' of https://github.com/lucaboesch/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 9 May 2019 03:22:38 +0000 (11:22 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 9 May 2019 03:22:38 +0000 (11:22 +0800)

Trivial merge