Merge branch 'MDL-58535-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 3 May 2017 08:41:38 +0000 (16:41 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 3 May 2017 08:41:38 +0000 (16:41 +0800)

Trivial merge