Merge branch 'MDL-65603-master' of git://github.com/peterRd/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 16 May 2019 03:01:57 +0000 (11:01 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 16 May 2019 03:01:57 +0000 (11:01 +0800)

Trivial merge