Merge branch 'MDL-65418-master' of https://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 3 May 2019 03:43:14 +0000 (11:43 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 3 May 2019 03:43:14 +0000 (11:43 +0800)

Trivial merge