Merge branch 'MDL-59844-master' of git://github.com/Dagefoerde/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Oct 2017 05:58:49 +0000 (13:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Oct 2017 05:58:49 +0000 (13:58 +0800)

Trivial merge