Git merges in Moodle 3.0.6 by David Monllao

commit 2e77fffa316ba878107c76454e61e608d77aba6f
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 06 Sep 2016 10:18:25 +0800
Tag:    v3.0.6

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

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

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

commit 8902327ac92ff21f0f54f35c2a804099eb77e756
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 05 Sep 2016 13:46:12 +0800
Tag:    v3.0.6

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

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

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

commit 12ed0259b691662b02d4e6643fa4e0965dad8d71
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 29 Aug 2016 16:54:29 +0800
Tag:    v3.0.6

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

commit 092fecd7be00dcc832ac64ecf2dfe1ed53201b92
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 29 Aug 2016 14:40:50 +0800
Tag:    v3.0.6

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

commit 22a42d50930d4dbfa34a6776107d1f2b261eb946
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 29 Aug 2016 14:31:59 +0800
Tag:    v3.0.6

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

commit f2a7331dca46e7e8b7e043199c76cb2f8440ea67
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 29 Aug 2016 11:19:15 +0800
Tag:    v3.0.6

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

commit 443dcc00c30a1c014815264d0eb5d5417bfb79b5
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 29 Aug 2016 11:14:36 +0800
Tag:    v3.0.6

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

commit 4e4040df8566e9508ea474b7b9402df6c90f2e0b
Author: David Monllao <davidm@moodle.com>
Date:   Wed, 24 Aug 2016 09:36:46 +0800
Tag:    v3.0.6

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

commit 16ede7192d351b9dbd8fc6ff93708199101415b6
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 23 Aug 2016 15:31:23 +0800
Tag:    v3.0.6

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

commit 893b75e6902f56e107c5182e159874ab006fc40f
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 23 Aug 2016 12:44:49 +0800
Tag:    v3.0.6

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

commit 568fea46d24b32462dd49c30d79ec535982c68c3
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 26 Jul 2016 09:57:07 +0800
Tag:    v3.0.6

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

commit 44d706222829c40f7ce82cb17f5b448bce55e13d
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 26 Jul 2016 05:05:07 +0800
Tag:    v3.0.6

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

commit 329e98a621a62a0d8350f4080e957d5f6e27894a
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 26 Jul 2016 02:41:27 +0800
Tag:    v3.0.6

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

commit 1e56841201dbb31d302c4fc34386557403212e43
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 19 Jul 2016 14:42:24 +0800
Tag:    v3.0.6

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

commit 32d225deab67b2b6380adc0fc835bd9dc156ea5b
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 19 Jul 2016 02:02:32 +0800
Tag:    v3.0.6

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

commit a4de0bbd5973c29c3b88175c738f07d80939d17d
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 19 Jul 2016 01:45:23 +0800
Tag:    v3.0.6

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

commit 0dc21f5a0ec201f21325216090f93913f5fe427c
Author: David Monllao <davidm@moodle.com>
Date:   Thu, 14 Jul 2016 17:28:44 +0800
Tag:    v3.0.6

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

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

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

commit 3be99e4e7c1f60c899e85ba31abf23d537936e49
Author: David Monllao <davidm@moodle.com>
Date:   Tue, 12 Jul 2016 16:30:59 +0800
Tag:    v3.0.6

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

commit 16d219ac90a6e4f20489086d935a39d0c41ea833
Author: David Monllao <davidm@moodle.com>
Date:   Mon, 11 Jul 2016 22:16:07 +0800
Tag:    v3.0.6

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

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

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