Merge branch 'wip-MDL-57055-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 26 Oct 2017 17:17:28 +0000 (19:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 26 Oct 2017 17:17:28 +0000 (19:17 +0200)

Trivial merge