Merge branch 'MDL-59042-master' of git://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 12 Jun 2017 05:29:03 +0000 (13:29 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 12 Jun 2017 05:29:03 +0000 (13:29 +0800)

Trivial merge