Merge branch 'wip-MDL-62411-master' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 24 Oct 2018 02:21:42 +0000 (10:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 24 Oct 2018 02:21:42 +0000 (10:21 +0800)

Trivial merge