Merge branch 'MDL-58040' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 10:43:46 +0000 (07:43 -0300)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 10:43:46 +0000 (07:43 -0300)

Trivial merge