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

Trivial merge