Merge branch 'MDL-64823_master' of https://github.com/marxjohnson/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 21 Feb 2019 02:32:29 +0000 (10:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 21 Feb 2019 02:32:29 +0000 (10:32 +0800)

Trivial merge