Git merges in Moodle 3.2.6 by Damyon Wiese

commit 7121cdfc3eb65025ba9a624165f3cefb623f6827
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Nov 2017 12:06:56 +0800
Tag:    v3.2.6

Merge branch 'MDL-60749-32' of git://github.com/sarjona/moodle into MOODLE_32_STABLE


commit 7b47a1e464f01c65de7b1c4239e1195ee6846ddd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 Nov 2017 15:11:02 +0800
Tag:    v3.2.6

Merge branch 'MDL-60752-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE


commit da0bb6a8206ed796b9d8bdcfd86a83da3e7ec715
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Nov 2017 11:15:14 +0800
Tag:    v3.2.6

Merge branch 'MDL-59858-32' of git://github.com/junpataleta/moodle into MOODLE_32_STABLE


commit 36043eacd3b4491f22eeb3fc5e63b40e00b75314
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Nov 2017 10:12:17 +0800
Tag:    v3.2.6

Merge branch 'MDL-60437_32-multilang-html-block-titles' of https://github.com/lucaboesch/moodle into MOODLE_32_STABLE


commit d83e2ba4cdb405e494ebbd7386ddda1ffd045aff
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 01 Nov 2017 11:15:44 +0800
Tag:    v3.2.6

Merge branch 'MDL-52037-32-fix' of https://github.com/andrewnicols/moodle into MOODLE_32_STABLE


commit 8e378ca989223c688b9299c20209bcb7be408090
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 26 Oct 2017 15:41:02 +0800
Tag:    v3.2.6

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


commit 8caec2eb7a4cb5b15e1c5212ad322adc6225e342
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 23 Oct 2017 13:20:02 +0800
Tag:    v3.2.6

Merge branch 'MDL-52653-32' of http://github.com/damyon/moodle into MOODLE_32_STABLE