Git merges in Moodle 3.3.4 by Damyon Wiese

commit 5ecd41650f8e07f2456b39874e9ec9fd52870506
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Dec 2017 11:26:34 +0800
Tag:    v3.3.4

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

commit 7f4bc03789c06cac1b6fcead1ceddde0570890e0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Dec 2017 10:53:07 +0800
Tag:    v3.3.4

Merge branch 'MDL-59999-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE

commit 65036261350fedc37a59eed02f2e748523f98efb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Dec 2017 13:00:31 +0800
Tag:    v3.3.4

Merge branch 'MDL-34389-33' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE

commit b62d6b901a38941199a04dc13baac2c13eecffc5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Dec 2017 12:54:26 +0800
Tag:    v3.3.4

Merge branch 'MDL-57431-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE

commit 511a150aa0587cdb1bcd6a491749082c020fa034
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Dec 2017 12:48:36 +0800
Tag:    v3.3.4

Merge branch 'MDL-54967-33' of git://github.com/zig-moodle/moodle into MOODLE_33_STABLE

commit 4fca4d4e87f8d347718a9a4e2abc23785f6a1054
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Dec 2017 12:01:50 +0800
Tag:    v3.3.4

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

commit aaa3a28e03d52d75093aec6c2ef7dc1a4332ec94
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 12:51:07 +0800
Tag:    v3.3.4

Merge branch 'MDL-44660-33' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE

commit 6a02fd458f630738f9b5d63c2154eb27c2aad8ce
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 12:15:05 +0800
Tag:    v3.3.4

Merge branch 'MDL-58058-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE

commit 9f35372c0c3d32221c59d856a408610c496de4a1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 11:36:00 +0800
Tag:    v3.3.4

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

commit 042077dd4788dc9a143ef78aa638c8845a88f1b5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 11:16:00 +0800
Tag:    v3.3.4

Merge branch 'MDL-60965-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE

commit c31343bf78646dfed4a4b1185f0b5f79ffba470b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 11:08:15 +0800
Tag:    v3.3.4

Merge branch 'MDL-60969_33' of git://github.com/markn86/moodle into MOODLE_33_STABLE

commit 3baef4ab4144d2d098e7c7ef92ee10cc3bbe12ce
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 10:40:54 +0800
Tag:    v3.3.4

Merge branch 'MDL-52538-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE

commit 25666e5ff5aebc45e31fff442195ac72e33d9803
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 10:26:30 +0800
Tag:    v3.3.4

Merge branch 'MDL-44667-33' of https://github.com/snake/moodle into MOODLE_33_STABLE

commit ba68a016ded6ae9eab886349e4a9a4cb17193d13
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 10:19:41 +0800
Tag:    v3.3.4

Merge branch 'MDL-60968-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE

commit c45ca633b7abfaaaac31db8cf9bc1c9d1a69365d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 09:22:25 +0800
Tag:    v3.3.4

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

commit 318697f60072b967285367c90f7accc2d90fc48e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 08:59:46 +0800
Tag:    v3.3.4

Merge branch 'MDL-54021-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE

commit c00848dbf2f6015ec6e35aa2e2e18c21bdbc5b5c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 16:57:21 +0800
Tag:    v3.3.4

Merge branch 'MDL-40790-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE

commit 5fd29e79dc0c0bee4ce3c34a55f53317ad37ef4b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 16:48:19 +0800
Tag:    v3.3.4

Merge branch 'MDL-56197-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE

commit 9fd5ed62178c6c730d9721a58c3c95013cc771df
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 13:14:39 +0800
Tag:    v3.3.4

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

commit 402d910a6097a9c2ebe4e8f4bf9f8bcbaf82fac4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 11:38:28 +0800
Tag:    v3.3.4

Merge branch 'MDL-54106-33' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE

commit 9a32a6d629803e673db905c20ebd481ed1950181
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Dec 2017 16:29:05 +0800
Tag:    v3.3.4

Merge branch 'MDL-60219-33' of https://github.com/abias/moodle into MOODLE_33_STABLE

commit 5dc5337f36304354a3b4fa489bf5feef897968b7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 Nov 2017 12:53:00 +0800
Tag:    v3.3.4

Merge branch 'MDL-53004-33' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE

commit 9e5c6b8d3dcf6e583abbbee46a5b3453c10f2e0c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 Nov 2017 12:15:13 +0800
Tag:    v3.3.4

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

commit 9962da5423e7c73029a3af770f1efebbac1e0bf4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 Nov 2017 12:07:15 +0800
Tag:    v3.3.4

Merge branch 'MDL-60669-33' of git://github.com/tobiasreischmann/moodle into MOODLE_33_STABLE

commit f5e3d2fe727c0e505ca1dcd72d827d3614dc23ed
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 Nov 2017 16:01:37 +0800
Tag:    v3.3.4

Merge branch 'MDL-60188-33' of git://github.com/rezaies/moodle into MOODLE_33_STABLE

commit 5e5283f9f30992b3db032ef7cefedb6ac446b2d9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Nov 2017 15:59:27 +0800
Tag:    v3.3.4

Merge branch 'MDL-60810_33' of git://github.com/markn86/moodle into MOODLE_33_STABLE

commit ce694bbb81b47741fab137f162e334347504460d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Nov 2017 15:32:05 +0800
Tag:    v3.3.4

Merge branch 'MDL-60809-33' of git://git.cameron1729.xyz/moodle into MOODLE_33_STABLE

commit 67def8d76bb5e4167b72d703c5edd85a3f96936e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Nov 2017 13:27:03 +0800
Tag:    v3.3.4

Merge branch 'MDL-27886-33' of git://github.com/tobiasreischmann/moodle into MOODLE_33_STABLE

commit 68791e3d6e81da3c286dbed11ce11ff986173468
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 17 Nov 2017 14:12:44 +0800
Tag:    v3.3.4

Merge branch 'MDL-60773-33' of https://github.com/snake/moodle into MOODLE_33_STABLE

commit be05d8c3f09e28bc2d7bac76a8ffca11d530656b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 15 Nov 2017 12:00:20 +0800
Tag:    v3.3.4

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

commit d60d047a9635e71bcea44dd63957e63534f40bd7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Nov 2017 17:06:45 +0800
Tag:    v3.3.4

Merge branch 'MDL-60675-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE

commit f8cecf2031f0accad3ee9c84dae43c5a8bf18e8c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 Nov 2017 14:38:49 +0800
Tag:    v3.3.4

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

commit 697d94550c0ccd9d4226d425bd79c2612e0067ee
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 Nov 2017 14:12:09 +0800
Tag:    v3.3.4

Merge branch 'MDL-60675-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE

commit 487b2376847b4419d3acad8eeefd1321a9c698e9
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 Nov 2017 13:30:42 +0800
Tag:    v3.3.4

Merge branch 'MDL-60355-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE