Merge branch 'MDL-60953-master' of https://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 09:43:53 +0000 (11:43 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Apr 2018 09:43:53 +0000 (11:43 +0200)

Trivial merge