Merge branch 'MDL-59454-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 31 Oct 2018 10:40:08 +0000 (11:40 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 31 Oct 2018 10:40:08 +0000 (11:40 +0100)

Trivial merge