Merge branch 'MDL-56688-master' of https://github.com/nwp90/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 08:32:38 +0000 (09:32 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 08:32:38 +0000 (09:32 +0100)

Trivial merge