Merge branch 'MDL-59810-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Aug 2017 05:05:33 +0000 (13:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Aug 2017 05:05:33 +0000 (13:05 +0800)

Trivial merge