Merge branch 'MDL-64388-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Dec 2018 01:12:58 +0000 (09:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Dec 2018 01:12:58 +0000 (09:12 +0800)

Trivial merge