Merge branch 'MDL-34498-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 6 Jun 2019 02:50:56 +0000 (10:50 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 6 Jun 2019 02:50:56 +0000 (10:50 +0800)

Trivial merge