Merge branch 'MDL-60942-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Dec 2017 08:44:44 +0000 (09:44 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 Dec 2017 16:54:54 +0000 (17:54 +0100)

Trivial merge