Merge branch 'MDL-57791_master-fix3' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 10:37:54 +0000 (11:37 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 10:37:54 +0000 (11:37 +0100)

Trivial merge