Merge branch 'MDL-61956-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 06:46:52 +0000 (14:46 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 06:46:52 +0000 (14:46 +0800)

Trivial merge