Merge branch 'MDL-58556-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Apr 2017 10:05:09 +0000 (11:05 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Apr 2017 10:05:09 +0000 (11:05 +0100)

Trivial merge