Merge branch 'MDL-65948-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jan 2020 00:50:03 +0000 (08:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jan 2020 00:50:03 +0000 (08:50 +0800)

Trivial merge