Merge branch 'MDL-62563-master-3' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Nov 2018 01:37:23 +0000 (09:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Nov 2018 01:37:23 +0000 (09:37 +0800)

Trivial merge