Merge branch 'master_MDL-60421' of https://github.com/danmarsden/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Feb 2018 09:46:35 +0000 (10:46 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 6 Feb 2018 09:46:35 +0000 (10:46 +0100)

Trivial merge