Merge branch 'MDL-46415-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 10 Oct 2018 04:05:44 +0000 (12:05 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 10 Oct 2018 04:05:44 +0000 (12:05 +0800)

Trivial merge