Merge branch 'MDL-62153-master' of git://github.com/bmbrands/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 14 May 2018 03:57:01 +0000 (11:57 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 14 May 2018 03:57:01 +0000 (11:57 +0800)

Trivial merge