Merge branch 'MDL-59688-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Aug 2017 09:24:50 +0000 (10:24 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Aug 2017 09:24:50 +0000 (10:24 +0100)

Trivial merge