Merge branch 'MDL-61236-master' of git://github.com/farhan6318/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 11:13:55 +0000 (12:13 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 11:13:55 +0000 (12:13 +0100)

Trivial merge