Merge branch 'MDL-65129-master-2' of git://github.com/peterRd/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 14 Aug 2019 07:31:07 +0000 (15:31 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 14 Aug 2019 07:31:07 +0000 (15:31 +0800)

Trivial merge