Merge branch 'MDL-58899-master' of https://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 12 May 2017 04:00:52 +0000 (12:00 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 12 May 2017 04:00:52 +0000 (12:00 +0800)

Trivial merge