Merge branch 'MDL-58860-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 9 May 2017 09:05:39 +0000 (17:05 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 9 May 2017 09:05:39 +0000 (17:05 +0800)

Trivial merge