Merge branch 'MDL-65443' of https://github.com/NeillM/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Aug 2019 08:35:34 +0000 (16:35 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Aug 2019 08:35:34 +0000 (16:35 +0800)

Trivial merge