Merge branch 'MDL-58790' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Oct 2017 07:39:26 +0000 (15:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Oct 2017 07:39:26 +0000 (15:39 +0800)

Trivial merge