Merge branch 'MDL-64886_master' of https://github.com/marxjohnson/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Mar 2019 02:04:15 +0000 (10:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Mar 2019 02:04:15 +0000 (10:04 +0800)

Trivial merge