Merge branch 'MDL-64426-master-2' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Jan 2019 07:58:40 +0000 (15:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Jan 2019 07:58:40 +0000 (15:58 +0800)

Trivial merge