Merge branch 'MDL-46779-master' of https://github.com/ryanwyllie/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Fri, 1 Nov 2019 06:12:38 +0000 (14:12 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 4 Nov 2019 11:21:39 +0000 (19:21 +0800)

Trivial merge