Merge branch 'MDL-58486' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Apr 2017 11:15:40 +0000 (12:15 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Apr 2017 11:15:40 +0000 (12:15 +0100)

Trivial merge