Merge branch 'MDL-59567-master' of https://github.com/mackensen/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jan 2018 01:30:59 +0000 (09:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jan 2018 01:30:59 +0000 (09:30 +0800)

Trivial merge