Merge branch 'MDL-60904' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Sun, 26 Nov 2017 22:27:57 +0000 (11:27 +1300)
committerJun Pataleta <jun@moodle.com>
Sun, 26 Nov 2017 22:27:57 +0000 (11:27 +1300)

Trivial merge