Merge branch 'MDL-45367-master' of https://github.com/lucaboesch/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Jan 2018 00:34:32 +0000 (08:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Jan 2018 00:34:32 +0000 (08:34 +0800)

Trivial merge