Merge branch 'MDL-58552-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Apr 2017 01:46:04 +0000 (09:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Apr 2017 01:46:04 +0000 (09:46 +0800)

Trivial merge