Merge branch 'MDL-60826-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 01:18:53 +0000 (09:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 01:18:53 +0000 (09:18 +0800)

Trivial merge