Merge branch 'MDL-67169' of https://github.com/stronk7/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Fri, 8 Nov 2019 02:43:05 +0000 (10:43 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Fri, 8 Nov 2019 02:43:05 +0000 (10:43 +0800)

Trivial merge