Git merges in Moodle 3.3.3 by Andrew Nicols

commit 77952f9b6f5edc8ced96e17d5dfe5934c82dbd95
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 10 Nov 2017 11:50:03 +0800
Tag:    v3.3.3

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

commit edb84bc356c180a6756dff56ca9dc29530d9dc44
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Oct 2017 09:15:40 +0800
Tag:    v3.3.3

Merge branch 'MDL-60139_33' of git://github.com/timhunt/moodle into MOODLE_33_STABLE

commit f649aafd9843179ec924f764737624cbe9efec16
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 Oct 2017 08:20:05 +0800
Tag:    v3.3.3

Merge branch 'MDL-60522-33' of https://github.com/Kathrin84/moodle into MOODLE_33_STABLE

commit 1f236c90b2db2dddca7e59a414f670ef555e84dc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 Oct 2017 10:50:52 +0800
Tag:    v3.3.3

Merge branch 'MDL-60605-33' of https://github.com/dvdcastro/moodle into MOODLE_33_STABLE

commit 944520fd81092ac6178410746dc0b99623ae6570
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 Oct 2017 09:20:05 +0800
Tag:    v3.3.3

Merge branch 'MOODLE_33_STABLE_MDL-60360_enable_file_indexing_retroactively' of https://github.com/mattporritt/moodle into MOODLE_33_STABLE

commit d6b67e26e36f989ac351728c0afc31f008de110f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Oct 2017 14:32:12 +0800
Tag:    v3.3.3

Merge branch 'wip-MDL-60543-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE

commit 0a12ba0807fcd7b619ccdebe1f72d7e9bb3b62b7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Oct 2017 14:05:52 +0800
Tag:    v3.3.3

Merge branch 'MDL-60162_33' of git://github.com/timhunt/moodle into MOODLE_33_STABLE

commit 6188594b5270a95cdf026fb4bc55f0a0a5530210
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Oct 2017 13:18:39 +0800
Tag:    v3.3.3

Merge branch 'MDL-60535_33-questionbank-button-styled' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE

commit 0afcdafdbc253cf30c9e1c5cbd383c56ea309b30
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Oct 2017 11:38:28 +0800
Tag:    v3.3.3

Merge branch 'wip-MDL-60104-m33' of git://github.com/amygroshek/moodle into MOODLE_33_STABLE

commit 0de940286f45cb16e223c4f1070e056592974b34
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 26 Oct 2017 11:30:32 +0800
Tag:    v3.3.3

Merge branch 'MOODLE_33_MDL-51892' of https://github.com/fwsl/moodle into MOODLE_33_STABLE

commit 82938bb56296652dad4b6f90e6eceb9ff2876558
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 25 Oct 2017 07:12:21 +0800
Tag:    v3.3.3

Merge branch 'MDL-36580_33' of https://github.com/stronk7/moodle into MOODLE_33_STABLE

commit 92126f2ea8d958173c017ca676ad89fa391d29bc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 Oct 2017 12:50:41 +0800
Tag:    v3.3.3

Merge branch 'MDL-36580_33' of https://github.com/stronk7/moodle into MOODLE_33_STABLE

commit 729ada251be56555acdc8357916eed16d2676431
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 Oct 2017 08:08:27 +0800
Tag:    v3.3.3

Merge branch 'MDL-57477_33' of https://github.com/appalachianstate/moodle into MOODLE_33_STABLE

commit 83a6957d2e348848c0f0cdb8d2140a2a6eb0aea2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 23 Oct 2017 20:27:16 +0800
Tag:    v3.3.3

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

commit 1c6b0718be38047fc898ab83e90bd12e9c6054e1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 20 Oct 2017 10:28:45 +0800
Tag:    v3.3.3

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

commit 6475e2cb5e8920bab2d55225871eb4d6aa32dbee
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 19 Oct 2017 11:29:20 +0800
Tag:    v3.3.3

Merge branch 'MDL-60319-MOODLE_33-google-converter-bug' of https://github.com/mspall/moodle into MOODLE_33_STABLE

commit 0be75ddb9957c5714a33e84e468a53b59eec8dfb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 11 Oct 2017 09:39:50 +0800
Tag:    v3.3.3

Merge branch 'MOODLE_33_STABLE_MDL-60276' of https://github.com/CengageEng/moodle into MOODLE_33_STABLE

commit 67a41913807fc9df5c18410f77307f780a361753
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 09 Oct 2017 14:10:08 +0800
Tag:    v3.3.3

Merge branch 'MDL-60317_33' of git://github.com/timhunt/moodle into MOODLE_33_STABLE

commit b278d3299973e710b73e11a29bebe5cb347031c1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 03 Oct 2017 10:33:32 +0800
Tag:    v3.3.3

Merge branch 'MDL-60210-33-upgradecheck' of git://github.com/mudrd8mz/moodle into MOODLE_33_STABLE

commit 7129db08e74e32359889b18ae5b0b3fbef8facc3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 02 Oct 2017 15:40:22 +0800
Tag:    v3.3.3

Merge branch 'MDL-58790_33' of git://github.com/timhunt/moodle into MOODLE_33_STABLE

commit f009ad959ad7f73339518a9613fb896307d60cc4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 02 Oct 2017 10:17:25 +0800
Tag:    v3.3.3

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

commit 76ed5670624c53914861012278c1f8517b53f140
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 26 Sep 2017 15:48:07 +0800
Tag:    v3.3.3

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

commit 2c9e28d2b835f1efdb11d821859822d2c7404a70
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 26 Sep 2017 09:40:30 +0800
Tag:    v3.3.3

Merge branch 'MDL-60052-33' of https://github.com/xow/moodle into MOODLE_33_STABLE

commit 620a05aa6af0ed5b1893d14983aada1687fa0ea2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 26 Sep 2017 09:26:10 +0800
Tag:    v3.3.3

Merge branch 'MOODLE_33_STABLE' of https://github.com/ConnorSheremeta/moodle into MOODLE_33_STABLE