Merge branch 'MDL-60175-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 07:07:05 +0000 (09:07 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 07:07:05 +0000 (09:07 +0200)

Trivial merge