Merge branch 'MDL-58771-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 8 May 2017 08:58:20 +0000 (16:58 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 8 May 2017 08:58:20 +0000 (16:58 +0800)

Trivial merge