Merge branch 'MDL-59824-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Aug 2017 04:00:45 +0000 (12:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Aug 2017 04:00:45 +0000 (12:00 +0800)

Trivial merge