Merge branch 'MDL-66148-master' of https://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 20 Aug 2019 09:07:59 +0000 (17:07 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 20 Aug 2019 09:07:59 +0000 (17:07 +0800)

Trivial merge