Git merges in Moodle 3.3.4 by Eloy Lafuente (stronk7)

commit 7857d77a30c966596f7d5c1284196c5e05fc22c0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Jan 2018 07:52:41 +0800
Tag:    v3.3.4

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

commit 6a8c7fd988c69cbd7b81ae494e5f7e191f9819cf
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Jan 2018 04:06:47 +0800
Tag:    v3.3.4

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

commit 1a7ded08927aa391f84a18b25062675dc086c74e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 09 Jan 2018 02:56:42 +0800
Tag:    v3.3.4

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

commit 1c6c7ac06d7c023d3a1058ef43ae7bc38cf3c79c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 08 Jan 2018 17:07:42 +0800
Tag:    v3.3.4

Merge branch 'MDL-61046-33-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_33_STABLE

commit c2155bef1965a28da6dc0787bab7feb894f6ef28
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 03 Jan 2018 07:25:42 +0800
Tag:    v3.3.4

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

commit 659b1ee30429ffd36bcd4a6c6661a351a17b8553
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 27 Dec 2017 07:42:10 +0800
Tag:    v3.3.4

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

commit 02d16e76c32a373323ef6f437e053a72bd53d92b
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 26 Dec 2017 07:25:48 +0800
Tag:    v3.3.4

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

commit e807adb913b7102c3f3e31d1d524619fd17ace04
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Dec 2017 18:29:54 +0800
Tag:    v3.3.4

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

commit 409a0ecf2aaa9bfbaaf8eac8fb66a027ce0dae6d
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Dec 2017 08:10:50 +0800
Tag:    v3.3.4

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

commit 9fcec4530dcea599b881cad4de9e40b74221705c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Dec 2017 08:05:09 +0800
Tag:    v3.3.4

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

commit 2489235195004cbaa9f5f2f125872ab21df42389
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 19 Dec 2017 07:46:16 +0800
Tag:    v3.3.4

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

commit 652948bd4b62b66f871cffe41a647a8b5dc7b42e
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Dec 2017 23:12:05 +0800
Tag:    v3.3.4

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

commit 70611182ec4e8a9854460a66dd8b83c8ac6ca43c
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Mon, 18 Dec 2017 19:16:57 +0800
Tag:    v3.3.4

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

commit b2b940caae9c4a19d8623267ae12bd259ccf594f
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 14 Dec 2017 21:47:40 +0800
Tag:    v3.3.4

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

commit 108411af390382165af1e4e8a12d9d80b2d608a6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Nov 2017 05:38:50 +0800
Tag:    v3.3.4

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

commit 3104923f6b736e954e4098b98789aa205c7d4991
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Nov 2017 04:00:00 +0800
Tag:    v3.3.4

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

commit 7edb9a48e05cbefd6bb03f36aaf6ba6de58cb586
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 29 Nov 2017 03:48:38 +0800
Tag:    v3.3.4

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

commit 6103daf4b075c7e7400138741ae5879aad11d903
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Tue, 28 Nov 2017 07:49:06 +0800
Tag:    v3.3.4

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