Merge branch 'MDL-63280_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 23:49:13 +0000 (07:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 23:49:13 +0000 (07:49 +0800)

Trivial merge