Merge branch 'MDL-52953-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Jul 2018 12:17:56 +0000 (14:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Jul 2018 12:17:56 +0000 (14:17 +0200)

Trivial merge