Merge branch 'MDL-60559-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 26 Oct 2017 17:15:44 +0000 (19:15 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 26 Oct 2017 17:15:44 +0000 (19:15 +0200)

Trivial merge