Merge branch 'MDL-67035' of https://github.com/stronk7/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 21 Nov 2019 03:55:07 +0000 (11:55 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 21 Nov 2019 03:55:07 +0000 (11:55 +0800)

Trivial merge