Merge branch 'MDL-67049' of https://github.com/stronk7/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 25 Nov 2019 01:33:42 +0000 (09:33 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 25 Nov 2019 01:33:42 +0000 (09:33 +0800)

Trivial merge