Merge branch 'MDL-61366' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 07:17:29 +0000 (15:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 07:17:29 +0000 (15:17 +0800)

Trivial merge