Merge branch 'MDL-65937-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Aug 2019 06:54:20 +0000 (14:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Aug 2019 06:54:20 +0000 (14:54 +0800)

Trivial merge