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

Trivial merge