Merge branch 'MDL-59518-master' of git://github.com/ankitagarwal/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Aug 2017 05:44:16 +0000 (13:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Aug 2017 05:44:16 +0000 (13:44 +0800)

Trivial merge