Merge branch 'MDL-58853' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 May 2017 08:17:47 +0000 (09:17 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 May 2017 08:17:47 +0000 (09:17 +0100)

Trivial merge