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

Trivial merge