Merge branch 'MDL-57455' of https://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Oct 2017 17:33:37 +0000 (19:33 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Oct 2017 17:33:37 +0000 (19:33 +0200)

Trivial merge