Merge branch 'MDL-59599-master' of https://github.com/Kathrin84/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Jul 2018 09:58:53 +0000 (11:58 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Jul 2018 09:58:53 +0000 (11:58 +0200)

Trivial merge