Merge branch 'MDL-60518-master' of git://github.com/aanabit/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Dec 2018 06:59:22 +0000 (14:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Dec 2018 06:59:22 +0000 (14:59 +0800)

Trivial merge