Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 7 Nov 2017 00:37:52 +0000 (13:37 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 7 Nov 2017 00:37:52 +0000 (13:37 +1300)

Trivial merge