Merge branch 'MDL-59268-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 08:04:59 +0000 (09:04 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 08:04:59 +0000 (09:04 +0100)

Trivial merge