Merge branch 'wip-MDL-52100-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 09:07:46 +0000 (10:07 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 09:07:46 +0000 (10:07 +0100)

Trivial merge