Merge branch 'MDL-61133-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Feb 2018 06:00:51 +0000 (14:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Feb 2018 06:00:51 +0000 (14:00 +0800)

Trivial merge