Merge branch 'MDL-57968-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jun 2018 00:57:13 +0000 (08:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jun 2018 00:57:13 +0000 (08:57 +0800)

Trivial merge