Merge branch 'MDL-62249-master' of git://github.com/zig-moodle/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 12:23:10 +0000 (14:23 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:17:27 +0000 (09:17 +0800)

Trivial merge