Git merges in Moodle 3.0.5 by Andrew Nicols

commit 119412b0ca82da34b59a71cedc72bcc0a1282cfa
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 07 Jul 2016 09:58:32 +0800
Tag:    v3.0.5

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

commit 6d68238b138869c3b913e6c45a6bbcc59157f47e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Jul 2016 15:29:29 +0800
Tag:    v3.0.5

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

commit e11ad0fc71f5a109c4c03295d7a64c20a7367adc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Jul 2016 11:26:53 +0800
Tag:    v3.0.5

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

commit 3c5501fc015f900cb3e5be4a38b0003176d8ba7c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Jul 2016 10:33:30 +0800
Tag:    v3.0.5

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

commit 12cce3ef84e59666b8cc81b8cb5e26ff20084c21
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 04 Jul 2016 09:11:04 +0800
Tag:    v3.0.5

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

commit 18af3d785871f36a6e89d5cf9055ce5bbf8367d4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 01 Jul 2016 10:20:23 +0800
Tag:    v3.0.5

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

commit ab13910a8e5ca3102690bd25284dfff961e92a3e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 13:02:11 +0800
Tag:    v3.0.5

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

commit b1b833ca00820f782faa5c535a5f377e8c6c0d10
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 12:41:24 +0800
Tag:    v3.0.5

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

commit 0eb3ffbcecfc40209d6ab9a728c047aa5ecd6f74
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 10:01:55 +0800
Tag:    v3.0.5

Merge branch 'MDL-54755_moodle30' of https://github.com/StudiUM/moodle into MOODLE_30_STABLE

commit c2c0dc1b4c04a0ca93ff4eeae309cbf3cc10699c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 09:40:55 +0800
Tag:    v3.0.5

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

commit 9543b1c57a898386d70dbece0f76174b50a148aa
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 28 Jun 2016 08:33:48 +0800
Tag:    v3.0.5

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

commit 9880e5fbd7229a854bce85f9c3776a83913f333c
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Jun 2016 14:23:40 +0800
Tag:    v3.0.5

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

commit 9d087a1a28f52a670465eb4f6656cb6aae56b043
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 27 Jun 2016 09:33:40 +0800
Tag:    v3.0.5

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

commit 7ab2ac2575edf428b0c330919dce62309ce3572b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 23 Jun 2016 14:49:37 +0800
Tag:    v3.0.5

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

commit a55c462eb88fd3954ebd658c027774460b4f8f9f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Jun 2016 14:19:33 +0800
Tag:    v3.0.5

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

commit 7f93f96a029b157d5fe4e8d666cc6a69c222dc57
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Jun 2016 12:11:12 +0800
Tag:    v3.0.5

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

commit 1242b84eb69000d1032c98d06ecbc64e4f334b1f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Jun 2016 11:32:35 +0800
Tag:    v3.0.5

Merge branch 'MDL-54881_30' of https://github.com/mr-russ/moodle into MOODLE_30_STABLE

commit 88b799a470d537cd13170de49ba9a2bbb8971e53
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Jun 2016 11:23:11 +0800
Tag:    v3.0.5

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

commit 3a435c4debbe03327456dd88866ede7adb27310b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 21 Jun 2016 10:31:04 +0800
Tag:    v3.0.5

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

commit 1367b116244fb8b5ee535637a0944324beb3b590
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 15 Jun 2016 09:12:53 +0800
Tag:    v3.0.5

Merge branch 'MDL-53788_modlti_m30' of git://github.com/nhoobin/moodle into MOODLE_30_STABLE

commit 7a58d43b1c696575d80f465f5373991ed29c9cf4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 14 Jun 2016 14:30:53 +0800
Tag:    v3.0.5

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

commit 76fd59d28789792358d04c357cf1aac79e8c1ee2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 14 Jun 2016 13:27:35 +0800
Tag:    v3.0.5

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

commit 53e32ff5b8d37ce9e9a3770cb651a31605a37f23
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 09 Jun 2016 09:56:58 +0800
Tag:    v3.0.5

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

commit e214b30e3f76f3897c5f1b44a5d531c89d1e241e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 08 Jun 2016 08:47:18 +0800
Tag:    v3.0.5

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

commit 451831e313d1c49d3103e1debcff25e6656296ab
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 03 Jun 2016 12:01:45 +0800
Tag:    v3.0.5

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

commit c2d39f88e3a8b2afd34cc890d368c40b921c3b97
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 01 Jun 2016 08:26:08 +0800
Tag:    v3.0.5

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

commit d26072d27555ab198f3adae3e056f9e50b74c0fa
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 May 2016 13:53:33 +0800
Tag:    v3.0.5

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

commit af313210edaae7f1d2bc3fc10d43cae4afeae981
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 31 May 2016 11:19:26 +0800
Tag:    v3.0.5

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

commit 4c3f595bc596648f3335e00b37bb64513f6e8dda
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 May 2016 14:44:35 +0800
Tag:    v3.0.5

Merge branch 'MDL-54567-30-build' of git://github.com/FMCorz/moodle into MOODLE_30_STABLE

commit 1b1ad2f2ee13f7d7fa55501575a83bd31d07eb19
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 30 May 2016 13:41:23 +0800
Tag:    v3.0.5

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

commit 1ca9ac5b7958ad2549e980351063d7983ee0cf0b
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 24 May 2016 09:07:16 +0800
Tag:    v3.0.5

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

commit b627d8c15bce6fa15164a7a627d0ecc3d7bf66aa
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 May 2016 12:27:44 +0800
Tag:    v3.0.5

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

commit 759c1e65bb320b5fa1e5595b18580c357a47738a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 May 2016 12:10:21 +0800
Tag:    v3.0.5

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

commit 544017f8841a7723be1befa587c80ec28c514a3a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 18 May 2016 10:38:20 +0800
Tag:    v3.0.5

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

commit 61b6d3d2042a20b5fa8372ed4d56be221ea5d774
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 17 May 2016 11:09:37 +0800
Tag:    v3.0.5

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

commit b69b0543c796726a83adf95f61ad7bcace201168
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 17 May 2016 10:56:49 +0800
Tag:    v3.0.5

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

commit c3bac7250a646255a763fbc5cba20fc953be0852
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 11 May 2016 15:02:09 +0800
Tag:    v3.0.5

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

commit cb19237594ad44d88de56a45913d45884734887a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 11 May 2016 14:12:41 +0800
Tag:    v3.0.5

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

commit c768daa20be5012f30271d08ffc41de4edf82c91
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 11 May 2016 11:16:00 +0800
Tag:    v3.0.5

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

commit 539c1cf9ec2c5fe3d7e4d9a5f1476ce5e68771cd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 11 May 2016 10:42:42 +0800
Tag:    v3.0.5

Merge branch 'MDL-54110_30_STABLE' of https://github.com/marxjohnson/moodle into MOODLE_30_STABLE

commit d7491c3314927e70fbe3b9f983de5d5316b6d2fb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 10 May 2016 12:09:53 +0800
Tag:    v3.0.5

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

commit 1a1182740b2c45118702918cf5a59bc268a27895
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 10 May 2016 11:38:34 +0800
Tag:    v3.0.5

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

commit a5573b48627c42e17e92206537e76afdc96e6611
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 10 May 2016 10:16:44 +0800
Tag:    v3.0.5

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

commit 1ffadaf625780f822df9b5cda7a185dc942ae45e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 09 May 2016 15:52:30 +0800
Tag:    v3.0.5

Merge branch 'MDL-52708-30_STABLE' of https://github.com/ramdesh/moodle into MOODLE_30_STABLE