Merge branch 'MDL-59418-master' of https://github.com/Kathrin84/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Jul 2017 07:52:10 +0000 (08:52 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Jul 2017 07:52:10 +0000 (08:52 +0100)

Trivial merge