Merge branch 'MDL-52263-master' of git://github.com/crazyserver/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Apr 2016 15:50:29 +0000 (16:50 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Apr 2016 15:50:29 +0000 (16:50 +0100)

Trivial merge