Merge branch 'MDL-59639-master' of git://github.com/bmbrands/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 7 Aug 2019 03:29:32 +0000 (11:29 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 7 Aug 2019 03:29:32 +0000 (11:29 +0800)

Trivial merge