Merge branch 'MDL-61150' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Feb 2018 01:01:31 +0000 (09:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Feb 2018 01:01:31 +0000 (09:01 +0800)

Trivial merge