Merge branch 'MDL-52645-master-enfix' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jan 2016 15:31:51 +0000 (15:31 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jan 2016 15:31:51 +0000 (15:31 +0000)

Trivial merge