Merge branch 'MDL-65557-master' of https://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 14 May 2019 01:52:36 +0000 (09:52 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 14 May 2019 01:52:36 +0000 (09:52 +0800)

Trivial merge