Merge branch 'MDL-63591_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 21 Nov 2018 08:40:59 +0000 (09:40 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 21 Nov 2018 08:40:59 +0000 (09:40 +0100)

Trivial merge