Merge branch 'MDL-58908-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 6 Jun 2017 09:15:41 +0000 (17:15 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 6 Jun 2017 09:15:41 +0000 (17:15 +0800)

Trivial merge