Merge branch 'MDL-60162' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Oct 2017 06:04:45 +0000 (14:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Oct 2017 06:04:45 +0000 (14:04 +0800)

Trivial merge