Merge branch 'MDL-53858' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 28 Apr 2016 06:13:27 +0000 (14:13 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 29 Apr 2016 11:17:56 +0000 (12:17 +0100)

Trivial merge