Git merges in Moodle 3.1.2 by Dan Poltawski

commit 2516b865f218ad2485f41198b81a3792353061ea
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Sep 2016 18:48:52 +0800
Tag:    v3.1.2

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

commit 1ec726e2a48264ebad0d222f5339aeaf1e0acee7
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Sep 2016 15:45:44 +0800
Tag:    v3.1.2

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

commit 88e0275e2903489df22810e94eec947831a1685e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Sep 2016 21:09:16 +0800
Tag:    v3.1.2

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

commit dd5a5b75e643e0c8b0e383c1064c3ee7d2ef12bf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Sep 2016 17:50:47 +0800
Tag:    v3.1.2

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

commit f641bde359230250716fb0d43e50f81a0aee1e02
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Sep 2016 17:18:56 +0800
Tag:    v3.1.2

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

commit 5a7ce1b2a2bb327277cbcbf0e05c7bcfce290b5d
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Sep 2016 15:57:36 +0800
Tag:    v3.1.2

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

commit 51dd5393228f0b9beefbfc380dfa6993a241533a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Sep 2016 14:53:07 +0800
Tag:    v3.1.2

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

commit 846523c75bd5e9960b0b8ffe32e067670ce0d01f
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Aug 2016 19:09:44 +0800
Tag:    v3.1.2

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

commit 868acab35c6f4e93acab90334a14c1b671e0c9fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Aug 2016 22:48:11 +0800
Tag:    v3.1.2

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

commit db10a07def1537092497c830825989e617d72551
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Aug 2016 15:59:41 +0800
Tag:    v3.1.2

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

commit 2f46fadb78f68e23d43394311905c587c1493ac6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Aug 2016 22:25:38 +0800
Tag:    v3.1.2

Merge branch 'MDL-55273-cookie-secure-default-MOODLE_31_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_31_STABLE

commit 5d27e5363131009a2ae1217f0a6c4ae87e608675
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Aug 2016 21:13:27 +0800
Tag:    v3.1.2

Merge branch 'MDL-55605-lesson-restore-bug-MOODLE_31_STABLE' of https://github.com/kenneth-hendricks/moodle into MOODLE_31_STABLE

commit d62cb5dd84a74f68dc48e5507ee7434dbf14016a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Aug 2016 19:53:32 +0800
Tag:    v3.1.2

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

commit bbc4dd5810b30dedd6e7e7e59328d377e40dad04
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Aug 2016 19:45:54 +0800
Tag:    v3.1.2

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

commit 64227b4233a7a7e10921e64b208ba85c40bf7dbd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Aug 2016 16:57:21 +0800
Tag:    v3.1.2

Merge branch 'MDL_55423_31' of https://github.com/alexandru-elisei/moodle into MOODLE_31_STABLE

commit 5ec43185b27aa506c3315154e3707417eed45e73
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Aug 2016 19:05:13 +0800
Tag:    v3.1.2

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

commit 0ba31f0fd03ddd64f9bb9b57f4dff85e89088ac6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Aug 2016 20:14:41 +0800
Tag:    v3.1.2

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

commit 74d9779561d837f4dd52ed2d83e16d2c4cd0c310
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Aug 2016 18:43:46 +0800
Tag:    v3.1.2

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

commit 57d60766f5ced1da35ee69d8327ad81b37068310
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Aug 2016 18:38:34 +0800
Tag:    v3.1.2

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

commit dbb90a124228cd18cbbdd30b672ca005f37d367a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Aug 2016 18:35:37 +0800
Tag:    v3.1.2

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

commit cc94a621e09bfb29a12b6af540942ef6d9faff01
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Aug 2016 18:15:46 +0800
Tag:    v3.1.2

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

commit 6c906b7472dda7117dc7c928e91a462a14a5821a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Aug 2016 17:58:41 +0800
Tag:    v3.1.2

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

commit c349d5875ff39fff0e1114d8ad97c3a9883f5294
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Aug 2016 17:11:14 +0800
Tag:    v3.1.2

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

commit dde46ce38fb97125aceb8a5153e7a919bef16689
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Aug 2016 16:29:44 +0800
Tag:    v3.1.2

Merge branch 'MDL-55390_31-fix' of git://github.com/dmonllao/moodle into MOODLE_31_STABLE

commit 77d2baacb1951817d4239cbe7392d068d441e898
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Aug 2016 16:21:23 +0800
Tag:    v3.1.2

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

commit a943c4cd4dfa14bfaf0889ff264a56fac9827926
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Aug 2016 17:40:47 +0800
Tag:    v3.1.2

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

commit 50b5467ba1131193aa4b1e418409f7901dac2b33
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Aug 2016 17:33:45 +0800
Tag:    v3.1.2

Merge branch 'wip-MDL-55418-m31' of https://github.com/marinaglancy/moodle into MOODLE_31_STABLE

commit 311eae0213835d9b1bc2cf37e3bc04cd6707fd45
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Aug 2016 19:20:32 +0800
Tag:    v3.1.2

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

commit 82e580d6983b7733fe7157354d997e3b040f50a6
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Aug 2016 18:01:17 +0800
Tag:    v3.1.2

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

commit 8cf63715216a9364d0c1c79df12b9fbc0251cd14
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Aug 2016 18:00:34 +0800
Tag:    v3.1.2

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

commit 8025e88b877744e057cd50e3459cd12a21128c45
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Aug 2016 01:55:08 +0800
Tag:    v3.1.2

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

commit 79315c0306c837756a92f6c0617de8c272c3b279
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Aug 2016 23:06:58 +0800
Tag:    v3.1.2

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

commit 266e48893afba93908dc55758e8bc8adee658627
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Aug 2016 20:58:21 +0800
Tag:    v3.1.2

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

commit 32bc32736be5a1db26a6061398aa18e5055a5d4e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Aug 2016 20:50:40 +0800
Tag:    v3.1.2

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

commit f8b4522d35ae8eb6893981dc96b69201848a1ea5
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jul 2016 22:53:39 +0800
Tag:    v3.1.2

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

commit 929329f58c4914eaa5e5de8cf1b81d896f4e56ec
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 25 Jul 2016 17:28:29 +0800
Tag:    v3.1.2

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

commit e731e849f751ea12d08ba5a7c5fc011796ad74b5
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Jul 2016 17:52:35 +0800
Tag:    v3.1.2

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

commit f6824dd82f52d03f2be22a8589c3e7ee1feab908
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Jul 2016 16:38:58 +0800
Tag:    v3.1.2

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

commit f825156be9a195518e9ce19285a2a62cdcc7178b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jul 2016 21:49:52 +0800
Tag:    v3.1.2

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

commit bcbc0b9f037a56292e11243f816c610b0490583f
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jul 2016 21:21:04 +0800
Tag:    v3.1.2

Merge branch 'MDL-55190-31' of git://github.com/merrill-oakland/moodle into MOODLE_31_STABLE

commit 4dc180b05d966bb3008ec22d8489204ce4e489fc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jul 2016 20:53:41 +0800
Tag:    v3.1.2

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

commit bff5af27de68b65fde2c61a2fa57914a09d2c7fe
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jul 2016 20:38:39 +0800
Tag:    v3.1.2

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

commit 19722fbf9213645a01421cc6c082aff4afefdf9e
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jul 2016 20:27:53 +0800
Tag:    v3.1.2

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

commit 259c070a9d5831c1e808b1256e6d6dcefdc84922
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jul 2016 17:51:08 +0800
Tag:    v3.1.2

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

commit f1ec07fe11b8128d23664bcc9e3a7e56fdef34fd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jul 2016 16:17:53 +0800
Tag:    v3.1.2

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

commit 9770f74eda343dabc0ba59fb2a47bdb13bd5e3a2
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jul 2016 17:14:29 +0800
Tag:    v3.1.2

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

commit 3e159646ad95ef8d5256745fc201e161bbbe684a
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jul 2016 16:21:06 +0800
Tag:    v3.1.2

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

commit 27f66455dc32ea6d9d9f426460c65c0e9ba468f6
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Jul 2016 23:54:42 +0800
Tag:    v3.1.2

Merge branch 'MDL-54926-31' of git://github.com/merrill-oakland/moodle into MOODLE_31_STABLE

commit cca0fe3e3a8d55e15311e2e8c2ed3207684b9752
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Jul 2016 22:20:55 +0800
Tag:    v3.1.2

Merge branch 'MDL-55082-31' of git://github.com/merrill-oakland/moodle into MOODLE_31_STABLE

commit 2c089c2f72fe74313248559c9aacaabbb8247a2a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Jul 2016 21:42:14 +0800
Tag:    v3.1.2

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

commit 46844a6b6ed84b181e9ca721301bf0e05cab7615
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Jul 2016 21:37:57 +0800
Tag:    v3.1.2

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

commit 02848ae89fa67a9886a448e1bcae04325cb894fc
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Jul 2016 20:33:23 +0800
Tag:    v3.1.2

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

commit c9ddcaff4793076ce29c8debded1574852047a3b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Jul 2016 20:31:25 +0800
Tag:    v3.1.2

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