Merge branch 'MDL-57972-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Mar 2017 06:35:00 +0000 (14:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Mar 2017 06:35:00 +0000 (14:35 +0800)

Trivial merge