Merge branch 'MDL-64788_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 14 Feb 2019 01:40:13 +0000 (09:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 14 Feb 2019 01:40:13 +0000 (09:40 +0800)

Trivial merge