Merge branch 'MDL-60414-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 01:33:20 +0000 (09:33 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 01:33:20 +0000 (09:33 +0800)

Trivial merge