Git merges in Moodle 3.0.6 by Dan Poltawski

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

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

commit e4a959503b5e28b643b539f649dc2a62619d33fe
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 06 Sep 2016 15:46:09 +0800
Tag:    v3.0.6

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

commit 7b6f134c96fa07e64e40114e4368558f940486ae
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Sep 2016 21:09:15 +0800
Tag:    v3.0.6

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

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

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

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

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

commit 2087df46f6582257bfb7d7f2988dfa7b6e35686a
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 05 Sep 2016 15:57:38 +0800
Tag:    v3.0.6

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

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

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

commit b9435d3688f35876733773808880456007feb93a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 25 Aug 2016 19:09:40 +0800
Tag:    v3.0.6

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

commit f3c7517c859cbed66cfc76d56d2c5a9e6855a31f
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Aug 2016 22:48:13 +0800
Tag:    v3.0.6

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

commit 09c37aa4ebd69417c520884fce75ec405ed66f85
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 23 Aug 2016 15:59:40 +0800
Tag:    v3.0.6

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

commit bacf77c9d7f40b2a9f585dc8e351db08f7f54a59
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Aug 2016 22:25:40 +0800
Tag:    v3.0.6

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

commit a2b3f5864b5751b6bf54514d91dd803693cb71d4
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Aug 2016 21:13:28 +0800
Tag:    v3.0.6

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

commit 2dc70084d39b65c9a20dedb85d51f4c8d7e6215c
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Aug 2016 19:53:34 +0800
Tag:    v3.0.6

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

commit 68ec7cb52694af11d5d3932cb8161b8305988fa9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Aug 2016 19:45:55 +0800
Tag:    v3.0.6

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

commit a7a02f8cc060cc8f5dc2a84d88d68e09366b5dff
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 22 Aug 2016 16:12:54 +0800
Tag:    v3.0.6

Merge branch 'wip-MDL-22183-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE

commit bc0fc18cecc244ae77285f8adbfdc9c66e21d5b4
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 16 Aug 2016 19:05:23 +0800
Tag:    v3.0.6

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

commit 92ed7da4d13527c046ccb0ce9148cd9f99bf3d5b
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Aug 2016 20:14:42 +0800
Tag:    v3.0.6

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

commit 09dec86ebd2d94f0b5c6c75f967cadbca01554c9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Aug 2016 18:43:41 +0800
Tag:    v3.0.6

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

commit 8f300a967c4dcc724ee6f2698d2a882c41ce03af
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Aug 2016 18:35:39 +0800
Tag:    v3.0.6

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

commit 37cee5e44a0dd94c724fec43e8619b75303323d9
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 15 Aug 2016 18:14:06 +0800
Tag:    v3.0.6

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

commit c6cb45fce76a09af5640c1506aa0b356fdb1cb84
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 09 Aug 2016 17:58:42 +0800
Tag:    v3.0.6

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

commit 771f142254b470b7cba81692fb97a0a267a0e211
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 08 Aug 2016 17:40:50 +0800
Tag:    v3.0.6

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

commit 10ba40f1c31d7fe5c53a322d5e39a796d4421b24
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Aug 2016 19:20:33 +0800
Tag:    v3.0.6

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

commit 6e882379f44b9dd7dac1ccb7c422b0d43fca67af
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Aug 2016 17:59:55 +0800
Tag:    v3.0.6

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

commit 79598473d239db255e99e864c2d70ec2c009c41c
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 02 Aug 2016 01:57:22 +0800
Tag:    v3.0.6

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

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

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

commit b907a572620f98b3dba5f88dfcd807486d28c600
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 01 Aug 2016 18:47:44 +0800
Tag:    v3.0.6

Merge branch 'MDL-53691-M30' of git://github.com/lazydaisy/moodle into MOODLE_30_STABLE

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

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

commit baaf2e67e1722293325ad7bd54b3e41daef0aa85
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 19 Jul 2016 16:39:09 +0800
Tag:    v3.0.6

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

commit 87c1a2e7e82096d4dcba736bffde3bd6a6297f84
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jul 2016 21:49:54 +0800
Tag:    v3.0.6

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

commit 5a00afe7abf60d500a1ff55c714698adb0239393
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jul 2016 20:55:23 +0800
Tag:    v3.0.6

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

commit 5ef2a255236452e6f0b84bb2618f0e707186a9bd
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jul 2016 17:51:10 +0800
Tag:    v3.0.6

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

commit 4b6e0cbd572625cd9d3554e7066316949c7a3a14
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 18 Jul 2016 16:17:55 +0800
Tag:    v3.0.6

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

commit 68adc369116b6e4dac10195456926312f965e3db
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jul 2016 17:14:30 +0800
Tag:    v3.0.6

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

commit 8994550de2c4ce6c319b53cbdafd7756cdd87b85
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 12 Jul 2016 16:21:08 +0800
Tag:    v3.0.6

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

commit 069cc7b961b8bcb63f84ba5f2dd905df5f873ccf
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Jul 2016 21:42:15 +0800
Tag:    v3.0.6

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

commit cdf2cf7f39caaf61e3760a4fbdb15e4d4776ce82
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Jul 2016 21:37:59 +0800
Tag:    v3.0.6

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

commit e72b815237e236c51650e1eefd5524af5b18f575
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Jul 2016 20:33:24 +0800
Tag:    v3.0.6

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

commit 01a64e03adddab0c6094f94b5d11f0915ab36068
Author: Dan Poltawski <dan@moodle.com>
Date:   Mon, 11 Jul 2016 20:31:26 +0800
Tag:    v3.0.6

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