Merge branch 'MDL-64597-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 Feb 2019 08:36:00 +0000 (16:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 Feb 2019 08:36:00 +0000 (16:36 +0800)

Trivial merge