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

Trivial merge