Merge branch 'MDL-58646-master' of git://github.com/danpoltawski/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 6 Jun 2017 04:24:07 +0000 (12:24 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 6 Jun 2017 04:24:07 +0000 (12:24 +0800)

Trivial merge