Merge branch 'MDL-58905_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 12 May 2017 06:57:49 +0000 (14:57 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 12 May 2017 06:57:49 +0000 (14:57 +0800)

Trivial merge