Merge branch 'MDL-63702-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 31 Oct 2018 06:04:08 +0000 (14:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 31 Oct 2018 06:04:08 +0000 (14:04 +0800)

Trivial merge