Merge branch 'MDL-65831-master' of git://github.com/aanabit/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 31 Jul 2019 02:55:58 +0000 (10:55 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 31 Jul 2019 02:55:58 +0000 (10:55 +0800)

Trivial merge