Merge branch 'MDL-63684-master-1' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 31 Oct 2018 07:02:24 +0000 (15:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 31 Oct 2018 07:02:24 +0000 (15:02 +0800)

Trivial merge