Merge branch 'MDL-59809-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 21 Aug 2017 08:30:37 +0000 (16:30 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 21 Aug 2017 08:30:37 +0000 (16:30 +0800)

Trivial merge