Merge branch 'MDL-60815-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jan 2018 04:27:43 +0000 (12:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jan 2018 04:27:43 +0000 (12:27 +0800)

Trivial merge