Merge branch 'MDL-58482-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 21 Apr 2017 01:04:32 +0000 (09:04 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 21 Apr 2017 01:04:32 +0000 (09:04 +0800)

Trivial merge