Merge branch 'MDL-60851-master' of git://github.com/damyon/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 1 May 2019 01:32:54 +0000 (09:32 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 1 May 2019 01:32:54 +0000 (09:32 +0800)

Trivial merge