Merge branch 'MDL-59399-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 06:12:26 +0000 (08:12 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 06:12:26 +0000 (08:12 +0200)

Trivial merge