Merge branch 'MDL-59733-master-fix' of github.com:xow/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 23 Aug 2017 02:52:44 +0000 (10:52 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 23 Aug 2017 02:52:44 +0000 (10:52 +0800)

Trivial merge