Merge branch 'MDL-66770-master-2' of https://github.com/ryanwyllie/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 4 Nov 2019 04:56:34 +0000 (12:56 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 4 Nov 2019 11:21:41 +0000 (19:21 +0800)

Trivial merge