Merge branch 'MDL-57239' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 8 Aug 2019 00:49:56 +0000 (08:49 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 8 Aug 2019 00:49:56 +0000 (08:49 +0800)

Trivial merge