Merge branch 'MDL-59270-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 20 Jun 2017 01:58:37 +0000 (09:58 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 20 Jun 2017 01:58:37 +0000 (09:58 +0800)

Trivial merge