Git merges in Moodle 3.3.4 by Jake Dallimore

commit 272467514a23259db8737f7352c83a9af49ee5b9
Author: Jake Dallimore <jake@moodle.com>
Date:   Thu, 11 Jan 2018 09:23:42 +0800
Tag:    v3.3.4

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


commit 319e12ba835269453ef45a22c2f54bf8584bbeab
Author: Jake Dallimore <jake@moodle.com>
Date:   Mon, 27 Nov 2017 09:44:49 +0800
Tag:    v3.3.4

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


commit 657cb6b451fcdb016273c4d6edee63e799f647b3
Author: Jake Dallimore <jake@moodle.com>
Date:   Wed, 22 Nov 2017 15:43:10 +0800
Tag:    v3.3.4

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


commit c5430a26cfc585df53037edc624c9e211d5157f4
Author: Jake Dallimore <jake@moodle.com>
Date:   Tue, 14 Nov 2017 15:29:12 +0800
Tag:    v3.3.4

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