Merge branch 'MDL-52849-master' of git://github.com/peterRd/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 14 Aug 2019 01:03:37 +0000 (09:03 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 14 Aug 2019 01:03:37 +0000 (09:03 +0800)

Trivial merge