Merge branch 'MDL-38099-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 Apr 2018 12:14:20 +0000 (14:14 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 Apr 2018 12:14:20 +0000 (14:14 +0200)

Trivial merge