Git merges in Moodle 3.0.6 by Eloy Lafuente (stronk7)

commit 5b33ea8f5981b18459f647a230e918e7761f1211
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2016 22:20:51 +0800
Tag:    v3.0.6

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

commit f38037357a7b37669a6d1061d49d4fff904eaaa6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2016 22:08:31 +0800
Tag:    v3.0.6

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

commit 9c238c8e2553b91e68175b763599923cf8a146b0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 06 Sep 2016 00:07:27 +0800
Tag:    v3.0.6

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

commit d5e3b4879e0f587fdcac3b0df871565f9bbe227c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 05 Sep 2016 23:33:54 +0800
Tag:    v3.0.6

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

commit 4a59ad116844450a772ac8b8ee247e48a4aa64ea
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 30 Aug 2016 18:55:03 +0800
Tag:    v3.0.6

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

commit 5096a6d39d4355ae2cf638212e1a088814b61806
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2016 22:54:04 +0800
Tag:    v3.0.6

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

commit 5997c8775df96b1b6732b77a4e05e28e27f7bb81
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 29 Aug 2016 20:08:54 +0800
Tag:    v3.0.6

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

commit b7f6ea3578986732b4a422917bd0b265988bd2a5
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Aug 2016 06:51:52 +0800
Tag:    v3.0.6

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

commit 95086f294bf03334c20b474f891f5a19b7231f67
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Aug 2016 06:34:11 +0800
Tag:    v3.0.6

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

commit 8d5deef79e71db8b3c053cd52ac12215fe469d1b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Jul 2016 02:17:50 +0800
Tag:    v3.0.6

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

commit fbba7dfee6329b56136fe4711fea83ec550634ae
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Jul 2016 01:57:16 +0800
Tag:    v3.0.6

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

commit 89a02c4370ad711089e0f75e6458c12a43a8c360
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Jul 2016 19:27:20 +0800
Tag:    v3.0.6

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

commit ec75234e9c60415567e1b37eb8f372f8b6e03d51
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 21 Jul 2016 17:44:59 +0800
Tag:    v3.0.6

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

commit 44ce1facbc6c813622e037d12ae35092c57a0b31
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Jul 2016 19:22:43 +0800
Tag:    v3.0.6

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

commit 353c12c32f97db8ef992bb56ed0720bb27fd9c49
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Jul 2016 10:04:51 +0800
Tag:    v3.0.6

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

commit da0d992d2032b932b695e7b4821387e0c4be221e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Jul 2016 08:31:40 +0800
Tag:    v3.0.6

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

commit 970a714e13dd8a22d6891ee869fd9559dd445c0b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 13 Jul 2016 00:02:52 +0800
Tag:    v3.0.6

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

commit acc220362205df422924afcafdd5d2d22ab2eef7
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2016 23:51:56 +0800
Tag:    v3.0.6

Merge branch 'MDL-54892-MOODLE_30_STABLE' of https://github.com/tobiasreischmann/moodle into MOODLE_30_STABLE

commit ad857b10c330af85dc63da732fdbf8a9144ea12a
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2016 21:48:30 +0800
Tag:    v3.0.6

Merge branch 'MDL-55136_dataobject_30' of git://github.com/davosmith/moodle into MOODLE_30_STABLE

commit cd172ea20ee2a42dd67cfe45809543a012f202b2
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 12 Jul 2016 18:19:37 +0800
Tag:    v3.0.6

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