Merge branch 'MDL-65591-master' of git://github.com/rezaies/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 22 May 2019 03:06:31 +0000 (11:06 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 22 May 2019 03:06:31 +0000 (11:06 +0800)

Trivial merge