Merge branch 'MDL-67598' of https://github.com/stronk7/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 2 Jan 2020 02:19:07 +0000 (10:19 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 2 Jan 2020 02:19:07 +0000 (10:19 +0800)

Trivial merge