Merge branch 'MDL-60317' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Oct 2017 06:05:57 +0000 (14:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Oct 2017 06:05:57 +0000 (14:05 +0800)

Trivial merge