Merge branch 'MDL-58518-master' of git://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 8 May 2017 07:50:03 +0000 (15:50 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 8 May 2017 07:50:03 +0000 (15:50 +0800)

Trivial merge