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

Trivial merge