Merge branch 'MDL-58400-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 11 Apr 2017 01:14:12 +0000 (09:14 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 11 Apr 2017 01:14:12 +0000 (09:14 +0800)

Trivial merge