Merge branch 'MDL-60139' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Oct 2017 01:14:32 +0000 (09:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Oct 2017 01:14:32 +0000 (09:14 +0800)

Trivial merge