Git merges in Moodle 3.5.0 by Damyon Wiese

commit 6e1bfdda19e838f7a4a934567e9e4e5ee532d535
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Dec 2017 15:12:11 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-32113-master' of https://github.com/lucaboesch/moodle

commit 5fe6205813e673bb59257438adaf5d4893fc6f35
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Dec 2017 11:12:47 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60767-master-3' of https://github.com/snake/moodle

commit b260dec8b7ece6b99f6ccc29ab01b453b4568c7e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Dec 2017 10:49:36 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-59999-master' of git://github.com/mihailges/moodle

commit dcb623be71c45c99736ccd875dbf6914ce7d22db
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Dec 2017 12:56:58 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-34389-subcategories-for-category-changer' of https://github.com/lucaboesch/moodle

commit 2d08e6565a07f1892f4dac52152880326b04ed9f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Dec 2017 12:51:33 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-57431-master' of git://github.com/lameze/moodle

commit e95db3416ce09259dad6abb8c7c8e97a99105cd2
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Dec 2017 12:43:50 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-54967-master' of git://github.com/zig-moodle/moodle

commit 8c2a7f9c386c1426202996aa7fe1e2d099481717
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Dec 2017 11:35:29 +0800
Tag:    v3.5.0-beta

Merge branch 'wip-MDL-49995-master' of git://github.com/marinaglancy/moodle

commit 23611c375777995f724862821d78d83529fe18fc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 13 Dec 2017 11:30:46 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60964-master' of git://github.com/ryanwyllie/moodle

commit 8cdfa8692b858e51904f6d9cb0bccf5b3607b59b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 12:56:19 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-59438-master' of git://github.com/rezaies/moodle

commit a34a305d5310458847b6c82786b1b160132b5961
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 12:49:46 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-44660-master' of https://github.com/lucaboesch/moodle

commit a576da555eaf10d2619ab3116666749f06db77bf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 12:38:11 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60861-master' of git://github.com/ankitagarwal/moodle

commit 233c91e7d01462014147d86f49f90c9b30b91d59
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 12:27:12 +0800
Tag:    v3.5.0-beta

Merge branch 'master_MDL-60979' of https://github.com/danmarsden/moodle

commit 59be445c154dd70031ef3121016791389a923122
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 11:59:50 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-58058-master' of git://github.com/lameze/moodle

commit 302104af4bd3793e5476221641bbcf6b1b8c9fb0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 11:39:20 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60920-master' of https://github.com/lucaboesch/moodle

commit 80b6f3b05967890b03742fb866f7e78457b733eb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 11:31:16 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60945' of https://github.com/NeillM/moodle

commit 6b58bb56cb955769e3b13e2ef349deed43023032
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 11:15:03 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60965-master' of git://github.com/andrewnicols/moodle

commit f0d9af6036c8bd084f1e55bdffcf239636a2f60e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 11:08:46 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60969_master' of git://github.com/markn86/moodle

commit 57fe6616a8df48fc51f4cfd202f7be67ef36d334
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 10:40:15 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-52538-master' of git://github.com/mihailges/moodle

commit 39377f808336d0374a7789313dc56fcb1514d427
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 10:26:08 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-44667-master' of https://github.com/snake/moodle

commit 740a81eeb22697ea05d411259d583aef4f13cf50
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 10:19:00 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60968-master' of git://github.com/lameze/moodle

commit 8cae0850712d44fb79fa897ca31a0bf954838165
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 09:56:20 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60976-master' of https://github.com/matt-catalyst/moodle

commit 4786443998663b5276f0f2165910e45674376adf
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 09:13:43 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60041' of https://github.com/NeillM/moodle

commit 34adfcb4eeb73f022488c4540f53a75a6bf2054d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 08:55:57 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-54021-master' of git://github.com/mihailges/moodle

commit 807ba44cc651897f6036f01af83b0b982cc8b5ed
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 16:55:27 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-40790-master' of git://github.com/mihailges/moodle

commit 42cec8067385bc3064d903e9a7b008472ec262fd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 16:47:19 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-56197-master' of git://github.com/mihailges/moodle

commit 67c0e18ca2895ed5ab4d4d1d376959b8c4d93a75
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 14:54:46 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60057-master' of git://github.com/lameze/moodle

commit 5258525f0abed93822b0a1bbab924b167a530f9a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 14:08:08 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60060-master' of git://github.com/lameze/moodle

commit fe955c5645458df2e7a6692cc3c398b700f7acb5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 12:56:18 +0800
Tag:    v3.5.0-beta

Merge branch 'wip-MDL-45500-master' of git://github.com/marinaglancy/moodle

commit c6a507e9e714689186ca249297dde6795cc29ffe
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 12:52:23 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60948-master' of git://github.com/andrewnicols/moodle

commit 917923c8601cef00a7cbec10780ec08125bbd92a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 11:49:40 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60043' of git://github.com/timhunt/moodle

commit 5ec2ce20f5b0d3f59a79e4bd9aee60b327619226
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 11:37:48 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-54106-master' of https://github.com/lucaboesch/moodle

commit e82c025e60d88d1650b69826e99fec2aa1d526cc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 11:27:28 +0800
Tag:    v3.5.0-beta

Merge branch 'wip-MDL-31436-master' of git://github.com/marinaglancy/moodle

commit 97812f14c1bb7d70d80cd483f58e44ac37d3cd50
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 06 Dec 2017 10:07:58 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60880-master' of https://github.com/sammarshallou/moodle

commit bfb5d3ba266c158f912be571b40ac943eaf814af
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Dec 2017 13:56:04 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-37933_master' of git://github.com/markn86/moodle

commit a569a33097fc25300092263cf7401d6385b3595f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 05 Dec 2017 11:00:54 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-59875_m35v1' of https://github.com/sbourget/moodle

commit 713a2cbb250055fd6e0186958ed572eaac045375
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Dec 2017 16:28:16 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60219-master' of https://github.com/abias/moodle

commit b0c4f9c21c366e8b27e8d21be9b44ce9e0a1dc33
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Dec 2017 16:00:19 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-36056-master-enrolkeywhitespace' of git://github.com/mudrd8mz/moodle

commit 1e1bc822945a6f7abf82076352e1b9f8597cdda5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 29 Nov 2017 12:18:21 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle

commit d87a31d878d1512eecff8b29187e8ad1f6dfe598
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 Nov 2017 13:18:03 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-53004-master' of https://github.com/lucaboesch/moodle

commit 081ac9152627a44dbccfae7be17aa160ce3441e0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 Nov 2017 12:14:08 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-24678-master-chat_get_latest_message' of https://github.com/bozoh/moodle

commit 2c3d8a06c8ebbb9f16b1370d8ef781047f2d16f6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 Nov 2017 12:05:21 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60669-master' of git://github.com/tobiasreischmann/moodle

commit bdb157653b8e93a81169e198e62b295f5b02343d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 Nov 2017 11:38:40 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle

commit d3fa95abf163dac3565ae9fa6feb133198226fcc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 Nov 2017 15:57:41 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60188-master' of git://github.com/rezaies/moodle

commit 07a91fd4ccd56014c00fda66ad677cd019faf5b9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 23 Nov 2017 12:25:31 +0800
Tag:    v3.5.0-beta

Merge branch 'wip-MDL-27886-master' of https://github.com/marinaglancy/moodle

commit 1d596960177cac6fffa38431ff6b2e3a3c4b4aee
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Nov 2017 15:57:00 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60810_master' of git://github.com/markn86/moodle

commit f1c9b8de4748d6da989ee177af7db6a2170fef9a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Nov 2017 15:29:53 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60809-master' of git://git.cameron1729.xyz/moodle

commit e5902279220cee0ed02fc2a12f7aa38f5ea65735
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Nov 2017 15:23:42 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60806-master' of git://github.com/lameze/moodle

commit 18c02e9f281b382944f9d70c4e6257e62d317bdc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Nov 2017 13:25:37 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-27886-master' of git://github.com/tobiasreischmann/moodle

commit 5f8407d5dab3837dc521506a76ff07d3f0e19956
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 17 Nov 2017 14:11:12 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60773-master' of https://github.com/snake/moodle

commit a571aa9b85af568d53efa2aefdde7a31e9539184
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 15 Nov 2017 11:59:16 +0800
Tag:    v3.5.0-beta

Merge branch 'wip-MDL-59876-master' of git://github.com/abgreeve/moodle

commit aece25138f6455dbcf5319881314cf7837e68463
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Nov 2017 16:40:59 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60675-master' of git://github.com/mihailges/moodle

commit 294f1dbaa30d2a8479416cb2521f2a8ba561b81c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 Nov 2017 14:33:57 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60693-backup-multilang-activities' of https://github.com/lucaboesch/moodle

commit fee3033bc714f315a40f8f13d27245d282259330
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 Nov 2017 14:11:50 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60675-master' of git://github.com/mihailges/moodle

commit dbf0819d929df8815dd7785de01ebd287c717583
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 Nov 2017 10:47:49 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-59876-master' of git://github.com/jleyva/moodle

commit 3ac10fa82a5a5bdf76e6dc7812064dc875f92263
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 Nov 2017 10:37:37 +0800
Tag:    v3.5.0-beta

Merge branch 'MDL-60784' of git://github.com/stronk7/moodle