Merge branch 'MDL-60549-master' of https://github.com/davidknu/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jan 2018 02:08:26 +0000 (10:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jan 2018 02:08:26 +0000 (10:08 +0800)

Trivial merge