Merge branch 'MDL-60359-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Dec 2017 08:10:24 +0000 (09:10 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 Dec 2017 16:54:53 +0000 (17:54 +0100)

Trivial merge