Merge branch 'MDL-59154-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 12 Jun 2017 05:44:57 +0000 (13:44 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 12 Jun 2017 05:44:57 +0000 (13:44 +0800)

Trivial merge