Merge branch 'MDL-59075' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 May 2017 11:17:38 +0000 (12:17 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 May 2017 11:17:38 +0000 (12:17 +0100)

Trivial merge