Merge branch 'MDL-64889_master' of https://github.com/marxjohnson/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 27 Feb 2019 06:38:34 +0000 (14:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 27 Feb 2019 06:38:34 +0000 (14:38 +0800)

Trivial merge