Merge branch 'MDL-65583_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 15 May 2019 07:57:05 +0000 (15:57 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 15 May 2019 07:57:05 +0000 (15:57 +0800)

Trivial merge