Merge branch 'MDL-65446-master' of https://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 2 May 2019 07:00:41 +0000 (15:00 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 2 May 2019 07:00:41 +0000 (15:00 +0800)

Trivial merge