Merge branch 'MDL-6074-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jun 2018 01:38:55 +0000 (09:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jun 2018 01:38:55 +0000 (09:38 +0800)

Trivial merge