Merge branch 'MDL-60373-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Oct 2017 16:28:47 +0000 (18:28 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Oct 2017 16:28:47 +0000 (18:28 +0200)

Trivial merge