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

Trivial merge