Git merges in Moodle 3.1.2 by David Monllao

commit 9bb75e570da838b862bd2c84a6ba39e22ba2a9de
Author: David Monllao <davidm@moodle.com>
Date:   Thu, 08 Sep 2016 13:56:40 +0800
Tag:    v3.1.2

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

commit 009dcc16aeb0c1b21e4f28edc1c110f600afac07
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 06 Sep 2016 10:18:16 +0800
Tag:    v3.1.2

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

commit bf80c7b9c16d11135bc06a133737168f20468025
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 06 Sep 2016 10:07:11 +0800
Tag:    v3.1.2

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

commit d966b1b18d5c882a335ad0718549b4ba0efb7132
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 05 Sep 2016 13:45:46 +0800
Tag:    v3.1.2

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

commit 28181985df2dcab6877549892fe13e1e6434f16e
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 05 Sep 2016 11:48:43 +0800
Tag:    v3.1.2

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

commit c527b281d7b6a7dfbdd6413a1ef36d3d0624b820
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 05 Sep 2016 10:48:01 +0800
Tag:    v3.1.2

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

commit dae85c46588c9ed6c7bf37a3cd5565f67d53ff11
Author: David Monllao <davidm@moodle.com>
Date:   Thu, 01 Sep 2016 11:14:11 +0800
Tag:    v3.1.2

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

commit b514df00e1b91ee76d0b194a0fdf35e7ef9a9077
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 30 Aug 2016 12:52:48 +0800
Tag:    v3.1.2

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

commit e0434911f350e024ee127ca3f1f065982051d53c
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 29 Aug 2016 16:53:56 +0800
Tag:    v3.1.2

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

commit 7e240449029e286d403b7416a796241c0f908a54
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 29 Aug 2016 14:40:37 +0800
Tag:    v3.1.2

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

commit db78183e45eda64491a209a432d1b416ca5b97fd
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 29 Aug 2016 14:31:50 +0800
Tag:    v3.1.2

Merge branch 'MDL-55312_load_timeout_for_amd_modules_31' of https://github.com/gthomas2/moodle into MOODLE_31_STABLE

commit 4472485ebf63e01afd43e35af03b59b26c21ab3b
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 29 Aug 2016 11:19:08 +0800
Tag:    v3.1.2

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

commit 93611f5e2c970ef85e1d6a5f234b0d7cabf5e587
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 29 Aug 2016 11:14:28 +0800
Tag:    v3.1.2

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

commit 6f3590457e321c48e1c96b463204f0148daa1103
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 29 Aug 2016 10:26:58 +0800
Tag:    v3.1.2

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

commit 6fa8232f32222398fe5fae33e167713c0e22dabc
Author: David Monllao <davidm@moodle.com>
Date:   Wed, 24 Aug 2016 09:36:36 +0800
Tag:    v3.1.2

Merge branch 'MDL-55604-31' of https://github.com/mr-russ/moodle into MOODLE_31_STABLE

commit 954881c1879e9f093cd16920fabb31f48ff62572
Author: David Monllao <davidm@moodle.com>
Date:   Wed, 24 Aug 2016 08:24:42 +0800
Tag:    v3.1.2

Merge branch 'MDL-55385_31_STABLE' of https://github.com/marxjohnson/moodle into MOODLE_31_STABLE

commit 008dede3072e6f63275e89a7dd9a7673c4564f62
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 23 Aug 2016 15:31:12 +0800
Tag:    v3.1.2

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

commit 8ea8024e358a96693f59bbfad650bfe2ddb571fb
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 23 Aug 2016 13:00:42 +0800
Tag:    v3.1.2

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

commit 3a250bbae9bbc88ccaaefb746047a2178492ac70
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 23 Aug 2016 12:44:08 +0800
Tag:    v3.1.2

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

commit 2f905b06d788b87fea797bffde05c36921813d8b
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 26 Jul 2016 09:56:52 +0800
Tag:    v3.1.2

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

commit cf620188a7088b5c91137ffddd99ba04ffd3e966
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 26 Jul 2016 05:04:21 +0800
Tag:    v3.1.2

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

commit e764c1bf7200d9e23d9cb9183f9447fe3995da73
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 26 Jul 2016 02:41:06 +0800
Tag:    v3.1.2

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

commit ca8cef50d3ac0e914c10f3a196f7843be0ce7f25
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 19 Jul 2016 14:42:07 +0800
Tag:    v3.1.2

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

commit 923053d5a16b1f507eee567ddb40afe09bad644f
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 19 Jul 2016 02:02:22 +0800
Tag:    v3.1.2

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

commit 15f367ba1de887ee84d06b13f976b887e3b34a32
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 19 Jul 2016 01:45:08 +0800
Tag:    v3.1.2

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

commit 379b194e3e6201d00aaf3da6989eeea42a80a0ef
Author: David Monllao <davidm@moodle.com>
Date:   Thu, 14 Jul 2016 17:28:50 +0800
Tag:    v3.1.2

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

commit 0bf06fbee5609b746b47fb5fa4ff55945eebad83
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 12 Jul 2016 20:53:40 +0800
Tag:    v3.1.2

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

commit a59d8bfdcb44d2fe647d74386d282c7b3e1d0d2f
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 12 Jul 2016 19:16:40 +0800
Tag:    v3.1.2

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

commit c4312f0ac7cce94620af0a78bc872b2ac9d73cdc
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 12 Jul 2016 19:03:30 +0800
Tag:    v3.1.2

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

commit f7c1b3d77644fa8522f3a185372689c07792fe5d
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 12 Jul 2016 16:30:42 +0800
Tag:    v3.1.2

Merge branch 'MDL-55170_M31' of https://github.com/nadavkav/moodle into MOODLE_31_STABLE

commit 200c2745e9f54d3a889c0aaffec57500761487f9
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 11 Jul 2016 22:15:56 +0800
Tag:    v3.1.2

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

commit 9fda3f17d0b3be00a0c732b1ee2626d40db5f4e2
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 11 Jul 2016 12:47:34 +0800
Tag:    v3.1.2

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