Merge branch 'MDL-60570-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Sun, 29 Oct 2017 22:00:44 +0000 (11:00 +1300)
committerJun Pataleta <jun@moodle.com>
Sun, 29 Oct 2017 22:00:44 +0000 (11:00 +1300)

Trivial merge