Merge branch 'wip-MDL-62239-master' of https://github.com/Beedell/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 22 May 2018 02:05:13 +0000 (10:05 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 22 May 2018 02:05:13 +0000 (10:05 +0800)

Trivial merge