Merge branch 'MDL-63179-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 27 Aug 2018 10:21:00 +0000 (12:21 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 27 Aug 2018 10:21:00 +0000 (12:21 +0200)

Trivial merge