Merge branch 'MDL-62227-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 13:49:43 +0000 (15:49 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 13:49:43 +0000 (15:49 +0200)

Trivial merge