Merge branch 'MDL-60366_feedback_upgrade' of git://github.com/davosmith/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 26 Oct 2017 08:02:13 +0000 (16:02 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 26 Oct 2017 08:02:13 +0000 (16:02 +0800)

Trivial merge