Merge branch 'MDL-59432-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 06:58:23 +0000 (07:58 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 06:58:23 +0000 (07:58 +0100)

Trivial merge