Merge branch 'MDL-64530' of git://github.com/stronk7/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 23 May 2019 01:21:59 +0000 (09:21 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 23 May 2019 01:21:59 +0000 (09:21 +0800)

Trivial merge