Git merges in Moodle 3.1.x by Damyon Wiese

commit 28964ed251601777600a549a52952af535fe3a6f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 09:49:00 +0800
Tag:    v3.1.10

Merge branch 'MDL-61002-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE


commit 2393486db4c74ed631d5dec8770eb312398d8a96
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 26 Oct 2017 16:05:16 +0800
Tag:    v3.1.9

Merge branch 'MDL-60366_feedback_upgrade_31' of git://github.com/davosmith/moodle into MOODLE_31_STABLE