Merge branch 'MDL-58933' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 22 May 2017 06:12:36 +0000 (14:12 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 22 May 2017 06:12:36 +0000 (14:12 +0800)

Trivial merge