Merge branch 'MDL-67149-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 8 Nov 2019 02:09:58 +0000 (10:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 8 Nov 2019 02:09:58 +0000 (10:09 +0800)

Trivial merge