Merge branch 'MDL-60079-master' of https://github.com/nashtechdev01/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 9 Jan 2018 07:09:15 +0000 (08:09 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 9 Jan 2018 07:09:15 +0000 (08:09 +0100)

Trivial merge