Merge branch 'MDL-67017' of https://github.com/stronk7/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 20 Nov 2019 01:57:50 +0000 (09:57 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 20 Nov 2019 01:57:50 +0000 (09:57 +0800)

Trivial merge