Git merges in Moodle 3.4.2 by Andrew Nicols

commit c71654fd2c0571a450899435864159d2fc12bfe2
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 14 Mar 2018 10:33:44 +0800
Tag:    v3.4.2

Merge branch 'MDL-60398-34' of git://github.com/mihailges/moodle into MOODLE_34_STABLE

commit 50dcf3bdae40814f4967d17398dc3236913b4815
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Mar 2018 15:29:13 +0800
Tag:    v3.4.2

Merge branch 'MDL-60828-34' of git://github.com/sarjona/moodle into MOODLE_34_STABLE

commit e8dae4203d35a976fc4a757249dbf67a92fed10e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Mar 2018 13:23:10 +0800
Tag:    v3.4.2

Merge branch 'MDL-59070-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE

commit 30279d16dd926e47db5c0d5bcbb4ff4332546ffb
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Mar 2018 12:36:37 +0800
Tag:    v3.4.2

Merge branch 'MDL-61397-34' of git://github.com/zig-moodle/moodle into MOODLE_34_STABLE

commit 8088ae2b3c81dd8724ff894f7f8ae85aa3160525
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Mar 2018 12:21:00 +0800
Tag:    v3.4.2

Merge branch 'MDL-61567-34' of git://github.com/zig-moodle/moodle into MOODLE_34_STABLE

commit e842b68d67276f356ef76a4f1fcd68212e0a6c82
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Mar 2018 13:44:56 +0800
Tag:    v3.4.2

Merge branch 'MDL-61365-34' of git://github.com/sarjona/moodle into MOODLE_34_STABLE

commit 63a54665f2d8ea4da1cfc9c7cd515403e6420f7d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Mar 2018 12:26:28 +0800
Tag:    v3.4.2

Merge branch 'MDL-61513-34' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE

commit 69b0484c6be3135cd0261f12fb6d78262969e746
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Mar 2018 12:07:49 +0800
Tag:    v3.4.2

Merge branch 'MDL-61498-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE

commit bcc0d0e9ebd902c0a6b461303b4ebdd3f417216f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Mar 2018 11:52:00 +0800
Tag:    v3.4.2

Merge branch 'MDL-61261-34' of git://github.com/sarjona/moodle into MOODLE_34_STABLE

commit 6418439f0843c4a2b836ab92dcdeb3c7ab5e2e7d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 08 Mar 2018 15:27:32 +0800
Tag:    v3.4.2

Merge branch 'MDL-61423-34' of git://github.com/mihailges/moodle into MOODLE_34_STABLE

commit 74653366f3bd8a8facdc1c941d1c3e3ffacf6e94
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Mar 2018 11:37:37 +0800
Tag:    v3.4.2

Merge branch 'WIP-MDL-60658-34' of https://github.com/chkhanu/moodle into MOODLE_34_STABLE

commit e0008d0ae3390faebe3f31de74c6257c3816a104
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Mar 2018 10:57:46 +0800
Tag:    v3.4.2

Merge branch 'wip-MDL-61322-34' of git://github.com/abgreeve/moodle into MOODLE_34_STABLE

commit 7d0f5024835b23a58ff4fc67c71201a69e18d41f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Mar 2018 10:27:39 +0800
Tag:    v3.4.2

Merge branch 'MDL-61497-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE

commit 8221c18d51c5fa2787f479394cd20bfefdcbbf26
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 02 Mar 2018 10:03:28 +0800
Tag:    v3.4.2

Merge branch 'wip-MDL-61268-34' of git://github.com/abgreeve/moodle into MOODLE_34_STABLE

commit a40d205eb5e56c6b460d5c1d43cbf42abc7b107e
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Fri, 02 Mar 2018 09:34:46 +0800
Tag:    v3.4.2

Merge branch 'MDL-61196_34' of git://github.com/markn86/moodle into MOODLE_34_STABLE

commit 413d6b046b6f7fad762f4b2e20cc065e96aca670
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 01 Mar 2018 08:46:20 +0800
Tag:    v3.4.2

Merge branch 'MDL-61453-34-userpicturefiletype' of git://github.com/mudrd8mz/moodle into MOODLE_34_STABLE

commit 5cff9f0e9abfa780f7a71939bd44496d1e7752fc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 26 Feb 2018 10:27:29 +0800
Tag:    v3.4.2

Merge branch 'MDL-60547-34' of git://github.com/cescobedo/moodle into MOODLE_34_STABLE

commit bdf49f89f5e20da1728d4870942341ed58e04d7d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 26 Feb 2018 10:16:09 +0800
Tag:    v3.4.2

Merge branch 'MDL-61462-34' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE

commit 1af36b5ffdb7eccff510eeaca237feaad76b54e1
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 19 Feb 2018 11:38:06 +0800
Tag:    v3.4.2

Merge branch 'MDL-61421-34' of git://github.com/sarjona/moodle into MOODLE_34_STABLE

commit 058ba89dab05eef521b96b061e4986e433c66a19
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 19 Feb 2018 11:23:22 +0800
Tag:    v3.4.2

Merge branch 'MDL-61408-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE

commit d0064b9d05dd8afdd15badb3c897f2a133cc45f7
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 19 Feb 2018 09:06:54 +0800
Tag:    v3.4.2

Merge branch 'MDL-61289-34' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE

commit 80528b181a26e7f3fb6a24d96d3b5b2d69a539bc
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Feb 2018 09:04:27 +0800
Tag:    v3.4.2

Merge branch 'wip-34-MDL-61344' of https://github.com/ndunand/moodle into MOODLE_34_STABLE

commit e037ee80fbe0d65e5ed7ba6611d367ec72739a73
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 13 Feb 2018 09:02:31 +0800
Tag:    v3.4.2

Merge branch 'MDL-61150_34' of git://github.com/stronk7/moodle into MOODLE_34_STABLE

commit ba27a4f741a937765dd9ea32874f097e074a19aa
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Feb 2018 15:26:16 +0800
Tag:    v3.4.2

Merge branch 'MDL-61366_34' of git://github.com/timhunt/moodle into MOODLE_34_STABLE

commit db754476587b7673a5718145ef366886ee164923
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Feb 2018 13:35:03 +0800
Tag:    v3.4.2

Merge branch 'MDL-60958-34' of git://github.com/ryanwyllie/moodle into MOODLE_34_STABLE

commit 01dc5c1a450b2ee74c00f1d6d40c6d2024cb67b0
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Feb 2018 11:31:43 +0800
Tag:    v3.4.2

Merge branch 'MDL-61305-34-fix' of https://github.com/andrewnicols/moodle into MOODLE_34_STABLE

commit 8c12581e126df10e7f40ff113bb57fe93c4a5d31
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Feb 2018 09:07:45 +0800
Tag:    v3.4.2

Merge branch 'MDL-61305-m34' of https://github.com/sammarshallou/moodle into MOODLE_34_STABLE

commit 0d3166adb58afc6996e3eb5699ee68254b07f49a
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 12 Feb 2018 08:08:38 +0800
Tag:    v3.4.2

Merge branch 'MDL-61413_34' of git://github.com/stronk7/moodle into MOODLE_34_STABLE

commit 9cb9c857280c3f61be3745c33ffbfd7826e6f8c4
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 07 Feb 2018 12:52:42 +0800
Tag:    v3.4.2

Merge branch 'MDL-61377-34' of git://github.com/rezaies/moodle into MOODLE_34_STABLE

commit ab121de9dea62c31bff1523f305fe36e689639f9
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Feb 2018 17:30:32 +0800
Tag:    v3.4.2

Merge branch 'MDL-61269_34' of git://github.com/stronk7/moodle into MOODLE_34_STABLE

commit 429ea1545cedff14115f562b2b71d9d20a40a3c3
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 05 Feb 2018 15:52:28 +0800
Tag:    v3.4.2

Merge branch 'MDL-51189-34' of git://github.com/rezaies/moodle into MOODLE_34_STABLE

commit a9bb5dbe8d7bccee9a0661728569a5599d6a0340
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Wed, 31 Jan 2018 09:15:36 +0800
Tag:    v3.4.2

Merge branch 'MDL-61313_34' of git://github.com/dmonllao/moodle into MOODLE_34_STABLE

commit 82f5d60aa678c3cbce211cb502853e973ce6b3fd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 29 Jan 2018 13:27:01 +0800
Tag:    v3.4.2

Merge branch 'MDL-60077-34' of https://github.com/HuongNV13/moodle into MOODLE_34_STABLE

commit c5910cb7dcc2afa279bf5b27cc0a91f3a48f00bd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 29 Jan 2018 11:24:34 +0800
Tag:    v3.4.2

Merge branch 'MDL-61250-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE

commit 95fab37f665de310be45a407b74b99a22e931964
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 29 Jan 2018 08:19:57 +0800
Tag:    v3.4.2

Merge branch 'MDL-58410_34' of git://github.com/markn86/moodle into MOODLE_34_STABLE

commit 4a086154fae0f070cde554c6c43c3c32fbb8b4fd
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 25 Jan 2018 15:14:38 +0800
Tag:    v3.4.2

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

commit e4fac0f267e459087d09e01e831ec5453a71e97d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 22 Jan 2018 11:39:33 +0800
Tag:    v3.4.2

Merge branch 'MDL-61240_34' of git://github.com/stronk7/moodle into MOODLE_34_STABLE

commit ab4d19f2601c8fffc4c8c8341e170d68c950645f
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 22 Jan 2018 11:29:55 +0800
Tag:    v3.4.2

Merge branch 'MDL-60078-34' of https://github.com/nashtechdev01/moodle into MOODLE_34_STABLE

commit 7cdd1a5c8edb9d6a525b5a52309b83596f8f05e5
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Thu, 18 Jan 2018 12:48:01 +0800
Tag:    v3.4.2

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

commit 92eb0a6d9c3212256ff81b05cfe0748700388a20
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Tue, 16 Jan 2018 12:29:59 +0800
Tag:    v3.4.2

Merge branch 'MDL-60815-34' of git://github.com/ryanwyllie/moodle into MOODLE_34_STABLE

commit c4107dec84b04cfeb4032ec8cab10dba188df58d
Author: Andrew Nicols <andrew@nicols.co.uk>
Date:   Mon, 15 Jan 2018 13:49:03 +0800
Tag:    v3.4.2

Merge branch 'MDL-61156-34' of https://github.com/mwehr/moodle into MOODLE_34_STABLE