Merge branch 'MDL-39035-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 10:57:34 +0000 (12:57 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 10:57:34 +0000 (12:57 +0200)

Trivial merge