Merge branch 'MDL-60352-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 08:16:34 +0000 (16:16 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 08:16:34 +0000 (16:16 +0800)

Trivial merge