Merge branch 'MDL-45837_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 13 Feb 2018 06:48:16 +0000 (07:48 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 13 Feb 2018 06:48:16 +0000 (07:48 +0100)

Trivial merge