Merge branch 'MDL-64591' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 27 Feb 2019 01:54:35 +0000 (09:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 27 Feb 2019 01:54:35 +0000 (09:54 +0800)

Trivial merge