Merge branch 'MDL-59564-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Jul 2017 03:15:09 +0000 (11:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Jul 2017 03:15:09 +0000 (11:15 +0800)

Trivial merge