Merge branch 'MDL-56945-master' of git://github.com/zig-moodle/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 2 Jan 2018 02:09:45 +0000 (10:09 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 2 Jan 2018 02:09:45 +0000 (10:09 +0800)

Trivial merge