Merge branch 'MDL-58741-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 28 Apr 2017 03:59:47 +0000 (11:59 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 28 Apr 2017 03:59:47 +0000 (11:59 +0800)

Trivial merge