Merge branch 'MDL-56136' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 19:44:42 +0000 (20:44 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Oct 2016 19:44:42 +0000 (20:44 +0100)

Trivial merge