Merge branch 'MDL-56903-master-enfix' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 10:42:36 +0000 (10:42 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 10:42:36 +0000 (10:42 +0000)

Trivial merge