Merge branch 'MDL-57636_master' of https://github.com/dasistwas/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Jan 2019 05:45:04 +0000 (13:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Jan 2019 05:45:04 +0000 (13:45 +0800)

Trivial merge