Merge branch 'MDL_56093' of https://github.com/eledia/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Jul 2018 04:13:58 +0000 (12:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Jul 2018 04:13:58 +0000 (12:13 +0800)

Trivial merge