Merge branch 'MDL-52828-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 3 May 2019 02:59:42 +0000 (10:59 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 3 May 2019 02:59:42 +0000 (10:59 +0800)

Trivial merge