Merge branch 'MDL-31521-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 12:14:22 +0000 (13:14 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 12:14:22 +0000 (13:14 +0100)

Trivial merge