Merge branch 'MDL-59733-master' of https://github.com/xow/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 21 Aug 2017 02:40:27 +0000 (10:40 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 21 Aug 2017 02:40:27 +0000 (10:40 +0800)

Trivial merge