Merge branch 'MDL-61832-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 28 May 2018 01:21:48 +0000 (09:21 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 28 May 2018 01:21:48 +0000 (09:21 +0800)

Trivial merge