Git merges in Moodle 3.1.4 by Dan Poltawski

commit ea69f5f78fdc2a279f5fdb66c1df61e8cb03c2c8
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 06 Jan 2017 09:30:53 +0800
Tag:    v3.1.4

Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE

commit cb84158ba71a2348a24d99c378385fb4e6fc1984
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 05 Jan 2017 18:11:42 +0800
Tag:    v3.1.4

Merge branch 'MDL-57563-31-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE

commit 3ad6c077d9aafdd7d31f91e702e0b21115926260
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 04 Jan 2017 21:33:46 +0800
Tag:    v3.1.4

Merge branch 'MDL-57531-31-phpmailer' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE

commit 65e7dd77989af94fad0c75d33090db3e66e9136c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jan 2017 20:35:11 +0800
Tag:    v3.1.4

Merge branch 'm31_MDL-49557' of git://github.com/danmarsden/moodle into MOODLE_31_STABLE

commit 8dea0f4533882318c2e3725c0f429cfe8fe4a7cb
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jan 2017 20:15:04 +0800
Tag:    v3.1.4

Merge branch 'MDL-57080-m31' of https://github.com/micaherne/moodle into MOODLE_31_STABLE

commit 28bb924937265c039f14fdbd45cb40962cad164a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 02 Jan 2017 19:16:22 +0800
Tag:    v3.1.4

Merge branch 'wip-MDL-57464-31' of git://github.com/abgreeve/moodle into MOODLE_31_STABLE

commit 3b95075dddaa04fec734bac29ac666e8704ae661
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 29 Dec 2016 19:50:59 +0800
Tag:    v3.1.4

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

commit eb9aa633033badc3b8a50677e5f91d6f0a99b568
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 29 Dec 2016 19:46:50 +0800
Tag:    v3.1.4

Merge branch 'm31_MDL-50643' of git://github.com/danmarsden/moodle into MOODLE_31_STABLE

commit 977b92dd0b812ffcde37f85d84843ec83ada4be0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Dec 2016 23:11:58 +0800
Tag:    v3.1.4

Merge branch 'MDL-55955_31' of git://github.com/markn86/moodle into MOODLE_31_STABLE

commit 9ff6b6d5fa1d7745d8c06c0675cb65e78a796650
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 28 Dec 2016 23:05:59 +0800
Tag:    v3.1.4

Merge branch 'wip-MDL-57366-31' of git://github.com/abgreeve/moodle into MOODLE_31_STABLE

commit 0d5aa55fb6f1df78ad5c7f13a23a02dfb7ee5f8f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 22 Dec 2016 16:15:10 +0800
Tag:    v3.1.4

Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE

commit a902c760359325547591079be69b2f9ce1c02942
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 20 Dec 2016 17:19:28 +0800
Tag:    v3.1.4

Merge branch 'MDL-54996_m31v1' of https://github.com/sbourget/moodle into MOODLE_31_STABLE

commit 04f2ca8403fc0b13a5cd07eb97c071fc724ccff0
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Dec 2016 22:33:08 +0800
Tag:    v3.1.4

Merge branch 'MDL-55568_m31v2' of https://github.com/sbourget/moodle into MOODLE_31_STABLE

commit 52c8ba9fb50449740014adb8303b2e7751fc6a30
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Dec 2016 20:21:24 +0800
Tag:    v3.1.4

Merge branch 'wip-MDL-56912-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE

commit e23b813fba59450c2e0b4a4677bc9dd0601db832
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Dec 2016 19:25:50 +0800
Tag:    v3.1.4

Merge branch 'MDL-52098_31_STABLE' of git://github.com/Chocolate-lightning/moodle into MOODLE_31_STABLE

commit c828f9f1a9b196335fc40ceb41ce9a44eaeaef63
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Dec 2016 16:47:24 +0800
Tag:    v3.1.4

Merge branch 'MDL-53044-m31' of https://github.com/ak4t0sh/moodle into MOODLE_31_STABLE

commit 9ca69b62a78ad54cd0ed74362fe50f454194093a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 19 Dec 2016 16:35:44 +0800
Tag:    v3.1.4

Merge branch 'MDL-55715_m31v1' of https://github.com/sbourget/moodle into MOODLE_31_STABLE

commit ed41e346994eeb4303f1d4040656ffc5cc6cc93f
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 14 Dec 2016 00:34:59 +0800
Tag:    v3.1.4

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

commit 8656edd2e55735fa044f86e26ca2e208151c868b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 22:55:53 +0800
Tag:    v3.1.4

Merge branch 'MDL-56810' of https://github.com/Syxton/moodle into MOODLE_31_STABLE

commit 419bec2fd312614ffd838f684e4ea6b0087f719a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 18:25:11 +0800
Tag:    v3.1.4

Merge branch 'MDL-57250_m31' of git://github.com/markn86/moodle into MOODLE_31_STABLE

commit 727759006c506d88a127d49d4eb2126e4022afe7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 17:45:20 +0800
Tag:    v3.1.4

Merge branch 'MDL-56859-31' of https://github.com/snake/moodle into MOODLE_31_STABLE

commit 5e4744bb90a9509055d1f462f004fe669b276561
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 17:26:20 +0800
Tag:    v3.1.4

Merge branch 'MDL-57074-31' of https://github.com/snake/moodle into MOODLE_31_STABLE

commit 92d3e804822c6d9d6b3b127858ebac02727458d2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 16:47:38 +0800
Tag:    v3.1.4

Merge branch 'MDL-57182-31' of https://github.com/snake/moodle into MOODLE_31_STABLE

commit 00d9bc4a34f0a9683ade6c4eaf4a90080198d755
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 13 Dec 2016 16:46:10 +0800
Tag:    v3.1.4

Merge branch 'wip-MDL-57257-31' of git://github.com/abgreeve/moodle into MOODLE_31_STABLE

commit fae39b86c35365ec93a582469a2f931a504d87fa
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 22:09:39 +0800
Tag:    v3.1.4

Merge branch 'MDL-56525-m31' of https://github.com/ak4t0sh/moodle into MOODLE_31_STABLE

commit 67dc08ecf4530332ed4c524c3aeb7773c2a08f08
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 21:18:21 +0800
Tag:    v3.1.4

Merge branch 'MDL-55782-31-test' of git://github.com/ryanwyllie/moodle into MOODLE_31_STABLE

commit 6df5f57257065552b522808a4d66f9222e7757ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 21:00:58 +0800
Tag:    v3.1.4

Merge branch 'wip-mdl-52796-m31' of https://github.com/rajeshtaneja/moodle into MOODLE_31_STABLE

commit c780854bb9a570ba10a8c0e364d1183ea8093f91
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 17:34:05 +0800
Tag:    v3.1.4

Merge branch 'wip-MDL-54846-31-2' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE

commit 4d700925efd5a4fc4d92cb71126394fba74e1731
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 17:20:17 +0800
Tag:    v3.1.4

Merge branch 'MDL-56566_31' of https://github.com/bostelm/moodle into MOODLE_31_STABLE

commit 4f91062cf3efb630463e023e68a55dc0e82ad134
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 12 Dec 2016 17:04:28 +0800
Tag:    v3.1.4

Merge branch 'MDL-55906-grading-table-filters-not-reset' of https://github.com/ilya-catalyst/moodle into MOODLE_31_STABLE

commit df35af5c64be084901e33fc7a94fa51c28dda68b
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 08 Dec 2016 16:43:00 +0800
Tag:    v3.1.4

Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE

commit 7371bec501b8988a59246367793cc30eb34eb65a
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 07 Dec 2016 16:46:19 +0800
Tag:    v3.1.4

Merge branch 'MDL-56674-MOODLE_31_STABLE' of https://github.com/kenneth-hendricks/moodle into MOODLE_31_STABLE

commit 519a5a57db3bd04b5c0c4b0e5730bddd8053f897
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 23:56:30 +0800
Tag:    v3.1.4

Merge branch 'MDL-45873_31' of https://github.com/bostelm/moodle into MOODLE_31_STABLE

commit 2011db73124f6a3c2e946fd88540837f7ebd0920
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 20:48:39 +0800
Tag:    v3.1.4

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

commit 35f03242b0135386f3ec705e4f20c83a87a5f86b
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 20:46:20 +0800
Tag:    v3.1.4

Merge branch 'MDL-56836-31' of https://github.com/snake/moodle into MOODLE_31_STABLE

commit 9504cb7ced3705cfce19eb22cb4ce62f905c5215
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 20:42:05 +0800
Tag:    v3.1.4

Merge branch 'MDL-56233-31-mocksubmit' of https://github.com/roperto/moodle into MOODLE_31_STABLE

commit c0a448e3aadf1c4f50cbbf9678bbd6196065cca8
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 20:25:38 +0800
Tag:    v3.1.4

Merge branch 'MDL-57199_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE

commit 8ab44d9222b6452743600c1ab247fa31163c3ada
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Dec 2016 19:08:09 +0800
Tag:    v3.1.4

Merge branch 'MDL-56971-m31' of https://github.com/micaherne/moodle into MOODLE_31_STABLE

commit f8c8f9aeb17f940b087a6e6d8fc7f640711442cc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Dec 2016 23:48:34 +0800
Tag:    v3.1.4

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

commit 180f6c85e4260f8718a528363e2151f4ff771ebd
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 02 Dec 2016 23:18:00 +0800
Tag:    v3.1.4

Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE

commit 12661fa0d1dbfc55cc8ba6b86625f3544b596b38
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Nov 2016 19:04:41 +0800
Tag:    v3.1.4

Merge branch 'MDL-57169_m31' of git://github.com/markn86/moodle into MOODLE_31_STABLE

commit cf9332a2b6e9346a2be2b32d6a1bc55560720a8d
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 30 Nov 2016 17:52:45 +0800
Tag:    v3.1.4

Merge branch 'MDL-52199-incoming-nice-fail-MOODLE_31_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_31_STABLE

commit a02daa446b980fff4d2abd819cc190739c2eb1a6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 29 Nov 2016 21:32:19 +0800
Tag:    v3.1.4

Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE

commit 164225f7704ef7f9c1ad30eb90ded72ec6042ca5
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Nov 2016 23:58:03 +0800
Tag:    v3.1.4

Merge branch 'MDL-56948-31' of https://github.com/lucisgit/moodle into MOODLE_31_STABLE

commit 3caf19999288a5c74f28decefb12b715ae50cb91
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 24 Nov 2016 00:07:26 +0800
Tag:    v3.1.4

Merge branch 'MDL-53964_31' of https://github.com/timhunt/moodle into MOODLE_31_STABLE

commit 94d47cf18e8009e56e8eb2fa0ce1733605bdf9ab
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Nov 2016 20:31:24 +0800
Tag:    v3.1.4

Merge branch 'MDL-35949_31' of https://github.com/timhunt/moodle into MOODLE_31_STABLE

commit 38ea1a51e4dabbd9d30c3f47bbed9592190ff7f0
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 23 Nov 2016 16:26:23 +0800
Tag:    v3.1.4

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

commit 003171089d518cedf8757f5a13f41ffae3519943
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 21 Nov 2016 23:07:49 +0800
Tag:    v3.1.4

Merge branch 'wip-mdl-56898-m31' of https://github.com/rajeshtaneja/moodle into MOODLE_31_STABLE

commit eb11d15cb88dfd8805d4980f2c77ec182becf808
Author: Dan Poltawski <dan@moodle.com>
Date:   Fri, 18 Nov 2016 17:57:36 +0800
Tag:    v3.1.4

Merge branch 'install_31_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_31_STABLE

commit 789678b0d6c4948be6a374933945ebeab7082f32
Author: Dan Poltawski <dan@moodle.com>
Date:   Wed, 16 Nov 2016 00:29:42 +0800
Tag:    v3.1.4

Merge branch 'wip-mdl-56860-m31' of git://github.com/rajeshtaneja/moodle into MOODLE_31_STABLE

commit de7781f68bc5978aef8ea702b4661647660f8625
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Nov 2016 18:43:32 +0800
Tag:    v3.1.4

Merge branch 'MDL-56903-31-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE

commit c90864ca48f64c39859e484184def7ad30a8a979
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 15 Nov 2016 00:27:47 +0800
Tag:    v3.1.4

Merge branch 'MDL-54871_31' of https://github.com/bostelm/moodle into MOODLE_31_STABLE

commit 726e86074b27023d21ed4128ad4fb46fbdda0044
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Nov 2016 21:59:12 +0800
Tag:    v3.1.4

Merge branch 'MDL-56913_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE

commit ad0f00c75ab26b7a63b65827d41e157116f8b778
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Nov 2016 21:21:33 +0800
Tag:    v3.1.4

Merge branch 'mdl-56831-31_STABLE' of https://github.com/Dagefoerde/moodle into MOODLE_31_STABLE

commit 49a50541d1057bacbd8cd886f1813ef19fe34b5a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 14 Nov 2016 21:10:58 +0800
Tag:    v3.1.4

Merge branch 'MDL-56916-31-normalizedoc' of git://github.com/mudrd8mz/moodle into MOODLE_31_STABLE