Merge branch 'MDL-62357-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 May 2018 12:43:02 +0000 (20:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 May 2018 12:43:02 +0000 (20:43 +0800)

Trivial merge