Merge branch 'MDL-63493-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Oct 2018 03:40:20 +0000 (11:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Oct 2018 03:40:20 +0000 (11:40 +0800)

Trivial merge