Merge branch 'MDL-63512-master' of git://github.com/peterRd/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Dec 2018 01:48:46 +0000 (09:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Dec 2018 01:48:46 +0000 (09:48 +0800)

Trivial merge