Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Nov 2018 06:15:16 +0000 (14:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Nov 2018 06:15:16 +0000 (14:15 +0800)

Trivial merge