Merge branch 'MDL-58310-master' of https://github.com/xow/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 19 Jun 2017 05:25:10 +0000 (13:25 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 19 Jun 2017 05:25:10 +0000 (13:25 +0800)

Trivial merge