Git merges in Moodle 3.4.x by Damyon Wiese

commit 9d7e968130adb96211cee4ebba5474909220995b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 13 Nov 2018 11:58:33 +0800
Tag:    v3.4.7

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

commit 1d56c59038fa141a4093509e2a4c7c1bd7404b8d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 09 Nov 2018 09:14:30 +0800
Tag:    v3.4.6

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

commit 7fb9023bec4387445f6105766248575649c80269
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 07 Nov 2018 14:28:33 +0800
Tag:    v3.4.6

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

commit ea5f2ed91debf0399e3d3a00704e99e95cb8df4c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 07 Nov 2018 13:04:54 +0800
Tag:    v3.4.6

Merge branch 'MDL-63451_34' of https://github.com/peterspicer-catalyst/moodle into MOODLE_34_STABLE

commit a168c3ed17e271373306f9951029afd9e5886fd5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 05 Nov 2018 13:45:58 +0800
Tag:    v3.4.6

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

commit 668934466b442f3423075def95b68bca4218a11f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 16 Oct 2018 11:44:18 +0800
Tag:    v3.4.6

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

commit 2f4feacac75643e287303b5f3000afdb1363c53a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Dec 2017 11:26:12 +0800
Tag:    v3.4.1

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

commit 7d7edc88204181cd0e23e6042e69f2110d584006
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 19 Dec 2017 11:04:01 +0800
Tag:    v3.4.1

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

commit cf0386e763164c3cd56d179571c6eb5c0967794a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Dec 2017 13:00:10 +0800
Tag:    v3.4.1

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

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

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

commit 265e374204040bca3089a914c434b8ee4314ae9e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Dec 2017 12:48:16 +0800
Tag:    v3.4.1

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

commit e62e93aa0d28bc05a11579950b9565dfbb603f38
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 18 Dec 2017 12:01:28 +0800
Tag:    v3.4.1

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

commit daf44482e9b6c319cc6424e65bac7ad8ca1ff896
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 12:50:38 +0800
Tag:    v3.4.1

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

commit 45c42e01a3aa717faa8f8baa08c0fb3a0fa8ad81
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 12:38:39 +0800
Tag:    v3.4.1

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

commit 7354b4ea0eb1f87f12317e4d62c0bed5869d4050
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 12:10:40 +0800
Tag:    v3.4.1

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

commit 9f6edf21712e7f62c64d09f51ee80d5fb0525ca1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 11:35:34 +0800
Tag:    v3.4.1

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

commit 511c9addfa273d4fd28d28aba43dbbd15dee4947
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 11:15:36 +0800
Tag:    v3.4.1

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

commit 8616e10e89da42be693d8c8a1bf08822b40c5b77
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 11:08:30 +0800
Tag:    v3.4.1

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

commit aa383f1b479b44dc7f56ac45d592b279b75ac360
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 10:40:35 +0800
Tag:    v3.4.1

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

commit 8bb22c4544e0be2d16246e289e83b727de62e6eb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 10:26:18 +0800
Tag:    v3.4.1

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

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

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

commit 7522b6a2e3674ef8d4bded75ae7352301d293cd0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 09:21:59 +0800
Tag:    v3.4.1

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

commit 395c98575946aaddd41ac849e21e9a72a20ce22e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 12 Dec 2017 08:59:23 +0800
Tag:    v3.4.1

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

commit 684d866e20823f93b23cc6d3fc00307a9792bc75
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 16:56:33 +0800
Tag:    v3.4.1

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

commit 3b2e8b4a0a7506fe7cc1d1743867e5f7ee2654df
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 16:47:40 +0800
Tag:    v3.4.1

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

commit 60e57b8448187fbbc4ef04a77353fef1a6119cdc
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 13:14:05 +0800
Tag:    v3.4.1

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

commit 628f99bf454caedbcad48a5986ffc1e804001870
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 12:53:18 +0800
Tag:    v3.4.1

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

commit af9b21a388f46dc6dcc52aa500f07eb223c7205e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 11:38:04 +0800
Tag:    v3.4.1

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

commit de08d71fc8982e7e8a134253bf5efc10ec1199c8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 11 Dec 2017 11:29:20 +0800
Tag:    v3.4.1

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

commit 2af1421e343c8669255595acc60901f87da78d8c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 04 Dec 2017 16:28:39 +0800
Tag:    v3.4.1

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

commit 8938d826d9ab5f1b0d9ddf0767fd2dc204a0212c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 Nov 2017 12:50:57 +0800
Tag:    v3.4.1

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

commit 8952d3f1001e6591b6be9a9fa5cacd4941e8c53e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 28 Nov 2017 12:14:49 +0800
Tag:    v3.4.1

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

commit 3e2eb6293165036f37a2f32b3f43d297434322ab
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 27 Nov 2017 15:56:53 +0800
Tag:    v3.4.1

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

commit 6da402bf347eb2d752e6ef1818ae7cd411323911
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Nov 2017 15:58:58 +0800
Tag:    v3.4.1

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

commit 126c58ede4219acd02c8203c155bfe898c56b172
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Nov 2017 15:31:08 +0800
Tag:    v3.4.1

Merge branch 'MDL-60809-34' of git://git.cameron1729.xyz/moodle into MOODLE_34_STABLE

commit 6217d9117326954af99ee7d0271b542d9ab595f8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Nov 2017 15:25:44 +0800
Tag:    v3.4.1

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

commit 255541d5929e69c02175dc2db2ddbeb573381513
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 20 Nov 2017 13:26:06 +0800
Tag:    v3.4.1

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

commit 066b01a788967ba94d846faf45d7e27f84657aaa
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 15 Nov 2017 12:00:01 +0800
Tag:    v3.4.1

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

commit d56935d66fe117ae8b7106994b56173b5222c840
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 14 Nov 2017 17:07:08 +0800
Tag:    v3.4.1

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

commit 2454da368ade0e3e99a6eb7a1a1e996841e5856c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 Nov 2017 14:38:04 +0800
Tag:    v3.4.1

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

commit 8e899e949d7d06ca361444256408b41965c8b7a6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 Nov 2017 14:11:33 +0800
Tag:    v3.4.1

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

commit 9a854a2fc92703207b6db0f92144eca3be569537
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 Nov 2017 11:07:25 +0800
Tag:    v3.4.1

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

commit b6f1cf03e32e27e472e7c571af5d87530f659046
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 13 Nov 2017 10:41:05 +0800
Tag:    v3.4.1

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

commit f738fc8efd0f5c4b961dbb0a30def6184dd406d5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Nov 2017 13:57:04 +0800
Tag:    v3.4.0-rc3

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

commit 319243807532b0bdcdcbcb73885848e0950cea1c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Nov 2017 13:47:05 +0800
Tag:    v3.4.0-rc3

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

commit 4ceece6ea1187ad034e07d34d43f86a42abe2502
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Nov 2017 12:05:46 +0800
Tag:    v3.4.0-rc3

Merge branch 'MDL-60749-master' of git://github.com/sarjona/moodle

commit 6b2a9a6fb84e1fae01ec25ffb5d2cead3cc83816
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 10 Nov 2017 10:55:09 +0800
Tag:    v3.4.0-rc3

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

commit bef5a8ca10ded3a4adcd66a4f54495a9e61e1c1e
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 09 Nov 2017 15:08:11 +0800
Tag:    v3.4.0-rc3

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

commit b6319f70bd72f18dbe1455d733f4bd0dac9553dd
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 08 Nov 2017 15:46:44 +0800
Tag:    v3.4.0-rc2

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

commit 1ccc9f1953761aa08762869be311f5288c9e8873
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Nov 2017 11:59:49 +0800
Tag:    v3.4.0-rc2

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

commit 8aa01fcf61a4ff493d10ad38391e36571fc5b781
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Nov 2017 11:05:43 +0800
Tag:    v3.4.0-rc2

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

commit 40f05d23125a7075d2994f17968d42b9d341f922
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Nov 2017 14:18:40 +0800
Tag:    v3.4.0-rc2

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

commit ef29782f317f50089f45d700a4a09c1c7325d186
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Nov 2017 10:45:34 +0800
Tag:    v3.4.0-rc2

Merge branch 'MDL-59858-master' of git://github.com/junpataleta/moodle

commit 1ada616c569e04cc58075553c65b1d50750d1418
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Nov 2017 10:19:10 +0800
Tag:    v3.4.0-rc2

Merge branch 'MDL-60596_master' of git://github.com/dmonllao/moodle

commit 8443b889954bba3ed87626199da6f69f1fcbba3f
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 06 Nov 2017 10:09:08 +0800
Tag:    v3.4.0-rc2

Merge branch 'MDL-60437-multilang-html-block-titles' of https://github.com/lucaboesch/moodle

commit f18fb611c9554f8a850b4c7d176a27bb32634a29
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 Nov 2017 15:46:42 +0800
Tag:    v3.4.0-rc1

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

commit 5dbd051502b6017166a95d0d16afddbf69a9a1e8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 Nov 2017 14:39:32 +0800
Tag:    v3.4.0-rc1

Merge branch 'MDL-59950_master' of git://github.com/dmonllao/moodle

commit 41080050b0950ae7d8f465966c698417b8641bb7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 Nov 2017 13:03:35 +0800
Tag:    v3.4.0-rc1

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

commit ae348e78a0874c52783b25c23bc4c65dbe05ece4
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 Nov 2017 12:21:39 +0800
Tag:    v3.4.0-rc1

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

commit 71fc06aae5e1aa856ef65328784a18abe23be42a
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 Nov 2017 12:10:04 +0800
Tag:    v3.4.0-rc1

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

commit 4837fea0aa9def58d3320b3ac679f43e66b08601
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 Nov 2017 11:51:35 +0800
Tag:    v3.4.0-rc1

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

commit 671440d70890d7cab0b73cc09ceff7a808f9a252
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 Nov 2017 11:38:57 +0800
Tag:    v3.4.0-rc1

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

commit fca7e60c818dbcf4dcbd792605a5ce16a29f6612
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 02 Nov 2017 10:45:07 +0800
Tag:    v3.4.0-rc1

Merge branch 'MDL-60655-master' of git://github.com/junpataleta/moodle

commit 14a1672cffca1e8a38f52bbd63dfcc00b4f45fda
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 01 Nov 2017 11:14:50 +0800
Tag:    v3.4.0-rc1

Merge branch 'MDL-52037-master-fix' of https://github.com/andrewnicols/moodle

commit 7f91fb036b2419e2bb80f2ccdb03ab2a789b6920
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 26 Oct 2017 16:02:13 +0800
Tag:    v3.4.0-rc1

Merge branch 'MDL-60366_feedback_upgrade' of git://github.com/davosmith/moodle

commit ef7df2ae0a740aa3d24bfe671eeeaf5b365466c5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 26 Oct 2017 14:43:39 +0800
Tag:    v3.4.0-rc1

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

commit 7dfc9ea6b33d17a1d095d76c491e0577900a6237
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 26 Oct 2017 12:52:11 +0800
Tag:    v3.4.0-rc1

Merge branch 'wip-MDL-60390-fix' of https://github.com/marinaglancy/moodle

commit 032bda879ceb780514e40e19bf65020e28eb01ab
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 23 Oct 2017 13:14:03 +0800
Tag:    v3.4.0-beta

Merge branch 'MDL-52653-master' of http://github.com/damyon/moodle

commit 01df2313c09befcaff3899c39be741f6b85aaba8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 23 Oct 2017 12:10:04 +0800
Tag:    v3.4.0-beta

Merge branch 'MDL-60517_master' of git://github.com/dmonllao/moodle

commit 65db838650b3dc565e6d9e55b5dcad430a4c180b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 23 Oct 2017 11:13:32 +0800
Tag:    v3.4.0-beta

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

commit e93112a7cae9e92ca3fc1d4a64f8927e1efb9dc1
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 23 Oct 2017 11:11:14 +0800
Tag:    v3.4.0-beta

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

commit 022dccf2a722b5ae37dc56ca1d957bbbc910e892
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 19 Oct 2017 13:00:13 +0800
Tag:    v3.4.0-beta

Merge branch 'MDL-60001_gzopen' of https://github.com/mrmark/moodle

commit 96f1440b7a035bcf4cd438501c830193896781e6
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 19 Oct 2017 12:47:18 +0800
Tag:    v3.4.0-beta

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

commit b35b588f00524a8f9222f9c72a174b034e6b6c4c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 17 Oct 2017 12:04:23 +0800
Tag:    v3.4.0-beta

Merge branch 'MDL-60058-int-fix-1' of github.com:ryanwyllie/moodle

commit 6dc633fd93be0e71eb8a0446b2af80d649a96d7c
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 16 Oct 2017 12:28:59 +0800
Tag:    v3.4.0-beta

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

commit 14de134454dec9e0fca494a3451c6ce312e023f0
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 13 Oct 2017 09:20:18 +0800
Tag:    v3.4.0-beta

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

commit 2962f0fa51d2178588dbbdd7722cd2e20e8b8943
Author: Damyon Wiese <damyon@moodle.com>
Date:   Thu, 12 Oct 2017 14:31:17 +0800
Tag:    v3.4.0-beta

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

commit 3f94d190608397047da3c3211cb6c0ef7decdecb
Author: Damyon Wiese <damyon@moodle.com>
Date:   Wed, 11 Oct 2017 14:02:52 +0800
Tag:    v3.4.0-beta

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

commit f4594a22ecc0b720831e13f8ad3e8d9e0f12759d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Oct 2017 17:32:47 +0800
Tag:    v3.4.0-beta

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

commit 32d641c009f3e5e2a70b00d39b3f32ed1652f08d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Oct 2017 17:17:56 +0800
Tag:    v3.4.0-beta

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

commit 93effd739f4bca2e4bad74b414bfc4f5673276a5
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Oct 2017 13:05:31 +0800
Tag:    v3.4.0-beta

Merge branch 'MDL-59889-master' of git://github.com/Dagefoerde/moodle

commit 71fd9e53755a69a0147b3d6da21df951c611ae15
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 10 Oct 2017 12:46:55 +0800
Tag:    v3.4.0-beta

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