Git merges in Moodle 3.3.0 by Jake Dallimore

commit e84fefdb09d0692bb804e33741655523a300e22f
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 11 May 2017 11:41:48 +0800
Tag:    v3.3.0-rc3

Merge branch 'MDL-58777-master' of git://github.com/cameron1729/moodle

commit 977a01c33446b0ef7cef88614c54b53bae6fce17
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 09 May 2017 13:13:58 +0800
Tag:    v3.3.0-rc2

Merge branch 'MDL-56251_master-fix2' of https://github.com/markn86/moodle

commit 99e9d9ef64af7b8bbb0ec1db1645b145dea2b997
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 08 May 2017 14:16:14 +0800
Tag:    v3.3.0-rc2

Merge branch 'MDL-56251_master-fix' of https://github.com/markn86/moodle

commit 1d116698c71595a23bd70d3d0660871554429f5e
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 05 May 2017 13:39:57 +0800
Tag:    v3.3.0-rc1

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

commit 7a37f761bcec641d3d5763132f199c77b8c5e837
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 05 May 2017 12:29:44 +0800
Tag:    v3.3.0-rc1

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

commit 42a123b1b7b646052732ebdd053d118d1e9ba429
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 05 May 2017 12:01:06 +0800
Tag:    v3.3.0-rc1

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

commit d59415222d69a897533cd43f74af8ad38bb5c3c6
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 03 May 2017 15:56:55 +0800
Tag:    v3.3.0-rc1

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

commit c7fe56a79bda4821d58c5bb3385a85b33e59e560
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 01 May 2017 14:51:43 +0800
Tag:    v3.3.0-rc1

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

commit 434f31bc128cd275ed8391fc10686fe447f8d9f7
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 01 May 2017 12:14:42 +0800
Tag:    v3.3.0-rc1

Merge branch 'MDL-58575-master' of git://github.com/cameron1729/moodle

commit ef35154953dba898ef0564960a98ca31349861da
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 27 Apr 2017 13:33:10 +0800
Tag:    v3.3.0-rc1

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

commit 5e74acef0eb23dae606cb186f1cd648625aad063
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 26 Apr 2017 14:49:48 +0800
Tag:    v3.3.0-rc1

Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

commit 0dcfadd9e417a85546d09ec0184e9ca1174befe0
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 24 Apr 2017 15:16:30 +0800
Tag:    v3.3.0-rc1

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

commit 4c7dc6af94729a7f795bb42917a7c142eda09610
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 24 Apr 2017 12:02:20 +0800
Tag:    v3.3.0-rc1

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

commit dd9c469ffcddbfff9ab313feaaf112672fe9e36f
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 21 Apr 2017 10:26:00 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58613-master-workshopfullname' of git://github.com/mudrd8mz/moodle

commit 7b79a90bea08995c0e3d2f6ab64f6d40e2647209
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 20 Apr 2017 15:10:21 +0800
Tag:    v3.3.0-beta

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

commit d8f9177462031876d55fee7efacef33b650cf4dc
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 20 Apr 2017 09:56:10 +0800
Tag:    v3.3.0-beta

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

commit fedb00d4bb1221a8a880d87bd3ce0cbacf02dec6
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 19 Apr 2017 15:50:48 +0800
Tag:    v3.3.0-beta

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

commit c89eba308ac66c3643f7ccd676bc0a66db66b576
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 11 Apr 2017 15:09:27 +0800
Tag:    v3.3.0-beta

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

commit 84fb93a77e975b234e98cd5079a2e8c67a8101fe
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 11 Apr 2017 10:49:07 +0800
Tag:    v3.3.0-beta

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

commit cea0492924ec18ace91b94c5b3d11e46112ec1f3
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 10 Apr 2017 12:36:56 +0800
Tag:    v3.3.0-beta

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

commit 94a26699b1d3a9b32a47371a5e0e798ebc0689d5
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 10 Apr 2017 10:25:23 +0800
Tag:    v3.3.0-beta

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

commit c846111951dec71e40530c68992e6273c5695d34
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 06 Apr 2017 16:29:13 +0800
Tag:    v3.3.0-beta

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

commit b8094f8a18fd0df910866f948a6b91ef9e4c1ef8
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 06 Apr 2017 09:41:37 +0800
Tag:    v3.3.0-beta

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

commit 6e58427458dffe6994d6e76d81dea5ad9d750dd8
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 06 Apr 2017 09:23:29 +0800
Tag:    v3.3.0-beta

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

commit 170a8b3ec45baee1095a76a239d262633c18f217
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 05 Apr 2017 09:33:45 +0800
Tag:    v3.3.0-beta

Merge branch 'MDL-58368-master' of git://github.com/damyon/moodle