Merge branch 'MDL-65571' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 13 May 2019 07:47:52 +0000 (15:47 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 13 May 2019 07:47:52 +0000 (15:47 +0800)

Trivial merge