Merge branch 'MDL-52832-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Feb 2018 11:18:27 +0000 (12:18 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 6 Feb 2018 11:18:27 +0000 (12:18 +0100)

Trivial merge