Merge branch 'MDL-62017-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 20 Jun 2018 11:40:39 +0000 (19:40 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 20 Jun 2018 11:40:39 +0000 (19:40 +0800)

Trivial merge