Merge branch 'MDL-62746-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Jul 2018 01:33:05 +0000 (09:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Jul 2018 01:33:05 +0000 (09:33 +0800)

Trivial merge