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

Trivial merge