Merge branch 'MDL-59243-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 12 Sep 2017 08:29:43 +0000 (16:29 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Sep 2017 08:29:43 +0000 (16:29 +0800)

Trivial merge