Merge branch 'MDL-60733-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 11:03:43 +0000 (12:03 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 11:03:43 +0000 (12:03 +0100)

Trivial merge