Merge branch 'MDL-58165-master' of https://github.com/abias/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 23 May 2017 06:41:42 +0000 (14:41 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 23 May 2017 06:41:42 +0000 (14:41 +0800)

Trivial merge