Git merges in Moodle 3.3.3 by Damyon Wiese

commit e6b9178eaacbefb97b6dd96bab1b52d032a12a14
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Nov 2017 12:06:35 +0800
Tag:    v3.3.3

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

commit 5e06871c052f06394bca9d8195ce45204d2ff9f7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 Nov 2017 15:10:30 +0800
Tag:    v3.3.3

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

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

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

commit 047785fbfde557f63dfa033e1f0974df2043957a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Nov 2017 10:11:32 +0800
Tag:    v3.3.3

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

commit 00d6486f73fdf12b1fa91554f72b81a48f45393f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 01 Nov 2017 11:15:28 +0800
Tag:    v3.3.3

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

commit cdef8f4e511d818e6ce17b9c1ad35375b6025912
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 26 Oct 2017 15:40:31 +0800
Tag:    v3.3.3

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

commit e66e807e811df1efd62d4e16c40b977092cf2220
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 23 Oct 2017 13:14:49 +0800
Tag:    v3.3.3

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

commit 2891fb44b94b1707549fe08f3e2afd868de555c8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 23 Oct 2017 11:16:25 +0800
Tag:    v3.3.3

Merge branch 'MDL-58605-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE

commit 564787c47ba994007c0c09d8cc4a5888bb40dd99
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Oct 2017 13:22:04 +0800
Tag:    v3.3.3

Merge branch 'MDL-59889-33' of git://github.com/Dagefoerde/moodle into MOODLE_33_STABLE