Merge branch 'MDL-63426-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 3 Oct 2018 07:25:22 +0000 (15:25 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 3 Oct 2018 07:25:22 +0000 (15:25 +0800)

Trivial merge