Merge branch 'MDL-59813-master' of git://github.com/farhan6318/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 08:03:03 +0000 (09:03 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 08:03:03 +0000 (09:03 +0100)

Trivial merge