Merge branch 'MDL-58582-master' of https://github.com/Dagefoerde/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 18 Apr 2017 01:20:10 +0000 (09:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 18 Apr 2017 01:20:10 +0000 (09:20 +0800)

Trivial merge