Merge branch 'MDL-63763-master' of https://github.com/nwp90/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Nov 2018 02:32:32 +0000 (10:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Nov 2018 02:32:32 +0000 (10:32 +0800)

Trivial merge