Merge branch 'MDL-58704-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 8 May 2017 05:58:59 +0000 (13:58 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 8 May 2017 05:58:59 +0000 (13:58 +0800)

Trivial merge