Merge branch 'MDL-58822-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 May 2017 05:55:20 +0000 (13:55 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 May 2017 05:55:20 +0000 (13:55 +0800)

Trivial merge