Merge branch 'MDL-66461-master' of git://github.com/jleyva/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 28 Aug 2019 03:15:28 +0000 (11:15 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 28 Aug 2019 03:15:28 +0000 (11:15 +0800)

Trivial merge