Merge branch 'MDL-58632-master' of https://github.com/xow/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 1 May 2017 06:26:37 +0000 (14:26 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 1 May 2017 06:26:37 +0000 (14:26 +0800)

Trivial merge