Merge branch 'MDL-33886-master' of git://github.com/zig-moodle/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Dec 2017 09:29:47 +0000 (10:29 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 Dec 2017 16:54:55 +0000 (17:54 +0100)

Trivial merge