Merge branch 'MDL-59574-master' of git://github.com/ankitagarwal/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 28 Nov 2017 06:38:23 +0000 (19:38 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 28 Nov 2017 06:38:23 +0000 (19:38 +1300)

Trivial merge