Merge branch 'MDL-57770-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 20 Jun 2017 08:27:48 +0000 (16:27 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 20 Jun 2017 08:27:48 +0000 (16:27 +0800)

Trivial merge