Merge branch 'MDL-58681' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 24 Apr 2017 02:24:33 +0000 (10:24 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 24 Apr 2017 02:24:33 +0000 (10:24 +0800)

Trivial merge