Merge branch 'MDL-65775-master' of git://github.com/ferranrecio/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 23 Jan 2020 02:50:37 +0000 (10:50 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 23 Jan 2020 07:11:02 +0000 (15:11 +0800)

Trivial merge