Merge branch 'MDL-59698-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Aug 2017 04:43:42 +0000 (12:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Aug 2017 04:43:42 +0000 (12:43 +0800)

Trivial merge