Merge branch 'MDL-62456_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 16 May 2018 06:56:33 +0000 (08:56 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 May 2018 06:56:33 +0000 (08:56 +0200)

Trivial merge