Merge branch 'MDL-63752' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 07:14:57 +0000 (15:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 07:14:57 +0000 (15:14 +0800)

Trivial merge