Merge branch 'MDL-59827-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Aug 2017 05:21:22 +0000 (13:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Aug 2017 05:21:22 +0000 (13:21 +0800)

Trivial merge