Merge branch 'MDL-58574-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 18 Apr 2017 06:43:57 +0000 (14:43 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 18 Apr 2017 06:43:57 +0000 (14:43 +0800)

Trivial merge