Merge branch 'MDL-62201-master' of git://github.com/bmbrands/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 30 Apr 2018 13:54:35 +0000 (21:54 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 30 Apr 2018 13:54:35 +0000 (21:54 +0800)

Trivial merge